nginx module: Fix ACME extraDomains, fix challenge url to not redirect to allow renewals

1 files changed, 4 insertions, 4 deletions

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index a84a3c9f2a2a..fb3f554bbf25 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -85,7 +85,9 @@ let
 
             server_name ${serverName} ${concatStringsSep " " vhost.serverAliases};
             ${optionalString vhost.enableACME "location /.well-known/acme-challenge { root ${vhost.acmeRoot}; }"}
-            return 301 https://$host${optionalString (port != 443) ":${port}"}$request_uri;
+            location / {
+              return 301 https://$host${optionalString (port != 443) ":${port}"}$request_uri;
+            }
           }
         ''}
 
@@ -227,9 +229,7 @@ in
 
     security.acme.certs = mapAttrs (vhostName: vhostConfig: {
       webroot = vhostConfig.acmeRoot;
-      extraDomains = genAttrs vhostConfig.serverAliases (alias: {
-        "${alias}" = null;
-      });
+      extraDomains = genAttrs vhostConfig.serverAliases (alias: null);
     }) virtualHosts;