modules/services/gitea/default.nix

@@ -50,7 +50,7 @@ in
     services.gitea =
       let
         inherit (config.networking) domain;
-        giteaDomain = "git.${domain}";
+        giteaDomain = "gitea.${domain}";
       in
       {
         enable = true;
@@ -112,16 +112,11 @@ in
     };
     users.groups.git = { };
 
-    my.services.nginx.virtualHosts = [
     # Proxy to Gitea
-      {
+    my.services.nginx.virtualHosts = [
-        subdomain = "git";
-        inherit (cfg) port;
-      }
-      # Redirect `gitea.` to actual forge subdomain
       {
         subdomain = "gitea";
-        redirect = config.services.gitea.rootUrl;
+        inherit (cfg) port;
       }
     ];
 

modules/services/nginx/default.nix

@@ -26,15 +26,6 @@ let
         '';
       };
 
-      redirect = mkOption {
-        type = with types; nullOr str;
-        default = null;
-        example = "https://example.com";
-        description = ''
-          Which domain to redirect to (301 response), for this virtual host.
-        '';
-      };
-
       root = mkOption {
         type = with types; nullOr path;
         default = null;
@@ -185,7 +176,7 @@ in
     assertions = [ ]
       ++ (lib.flip builtins.map cfg.virtualHosts ({ subdomain, ... } @ args:
       let
-        conflicts = [ "port" "root" "redirect" ];
+        conflicts = [ "port" "root" ];
         optionsNotNull = builtins.map (v: args.${v} != null) conflicts;
         optionsSet = lib.filter lib.id optionsNotNull;
       in
@@ -258,10 +249,6 @@ in
               (lib.optionalAttrs (args.root != null) {
                 inherit (args) root;
               })
-              # Redirect to a different domain
-              (lib.optionalAttrs (args.redirect != null) {
-                locations."/".return = "301 ${args.redirect}$request_uri";
-              })
               # VHost specific configuration
               args.extraConfig
               # SSO configuration