modules/forgejo/default.nix

@@ -3,8 +3,6 @@ let
   cfg = config.aether.forgejo;
   forgejo = config.services.forgejo;
   srv = forgejo.settings.server;
-
-  useSubdomain = !(builtins.isNull cfg.subdomain);
 in {
   imports = [ ./options.nix ];
 
@@ -24,7 +22,7 @@ in {
   security.acme.defaults.email = cfg.acmeEmail;
 
   networking.firewall.allowedTCPPorts =
-    [ 80 443 ];
+    [ 80 ] ++ lib.optional config.aether.https 443;
 
   # Forgejo
 
@@ -35,15 +33,16 @@ in {
     database.user = forgejo.user;
 
     settings.server = {
-      DOMAIN = lib.optionalString useSubdomain "${cfg.subdomain}."
+      DOMAIN = lib.optionalString (!(builtins.isNull cfg.subdomain)) "${cfg.subdomain}."
                + config.aether.domain;
       ROOT_URL = "https://${srv.DOMAIN}/";
     };
   };
 
   systemd.tmpfiles.rules =
-    lib.optional useSubdomain
-      "L+ ${forgejo.stateDir}/custom/templates - - - - ${cfg.templates}";
+    lib.optional
+      (!(builtins.isNull cfg.templates))
+      "L+ ${cfg.stateDir}/custom/templates - - - - ${cfg.templates}";
 }
 // lib.mkIf cfg.createUser {
   users.users.${forgejo.user} = {