system/hosts/server/default.nix

@@ -228,22 +228,14 @@ in {
       type = "postgres";
     };
     settings = {
-      federation.ENABLED = true;
-      "git.timeout" = {
-        DEFAULT = 6000;
-        MIGRATE = 6000;
-        MIRROR = 6000;
-        GC = 120;
-      };
       mailer = {
         ENABLED = true;
         FROM = "Forgejo <noreply@${cfg.domainName}>";
-        PROTOCOL = "smtp";
+        MAILER_TYPE = "smtp";
-        SMTP_ADDR = "mail.${cfg.domainName}";
+        HOST = "mail.${cfg.domainName}:587";
-        SMTP_PORT = 587;
         USER = "noreply@${cfg.domainName}";
         PASSWD = cfg.unhashedNoreplyPassword;
-        FORCE_TRUST_SERVER_CERT = true;
+        SKIP_VERIFY = true;
       };
       session = {
         COOKIE_SECURE = true;

system/modules/certspotter.nix

@@ -100,16 +100,13 @@ in {
             name = "hook${toString i}";
           }) cfg.hooks);
         });
+      environment.CERTSPOTTER_STATE_DIR = "/var/lib/certspotter";
       serviceConfig = {
         User = "certspotter";
         Group = "certspotter";
-        StateDirectory = "certspotter";
+        WorkingDirectory = "/var/lib/certspotter";
+        ExecStart = "${pkgs.certspotter}/bin/certspotter -sendmail ${cfg.sendmailPath} ${lib.escapeShellArgs cfg.extraFlags}";
       };
-      script = ''
-        export CERTSPOTTER_STATE_DIR="$STATE_DIR"
-        cd "$CERTSPOTTER_STATE_DIR"
-        ${pkgs.certspotter}/bin/certspotter -sendmail ${cfg.sendmailPath} ${lib.escapeShellArgs cfg.extraFlags}
-      '';
     };
   };
 }