JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tristan Helmich 2016-01-26 14:29:30 +01:00 committed by Robin Gloster
parent 4676983990
commit 900b311a38
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -85,8 +85,10 @@ let
server_name ${serverName} ${concatStringsSep " " vhost.serverAliases}; server_name ${serverName} ${concatStringsSep " " vhost.serverAliases};
${optionalString vhost.enableACME "location /.well-known/acme-challenge { root ${vhost.acmeRoot}; }"} ${optionalString vhost.enableACME "location /.well-known/acme-challenge { root ${vhost.acmeRoot}; }"}
location / {
return 301 https://$host${optionalString (port != 443) ":${port}"}$request_uri; return 301 https://$host${optionalString (port != 443) ":${port}"}$request_uri;
} }
}
''} ''}
server { server {
@ -227,9 +229,7 @@ in
security.acme.certs = mapAttrs (vhostName: vhostConfig: { security.acme.certs = mapAttrs (vhostName: vhostConfig: {
webroot = vhostConfig.acmeRoot; webroot = vhostConfig.acmeRoot;
extraDomains = genAttrs vhostConfig.serverAliases (alias: { extraDomains = genAttrs vhostConfig.serverAliases (alias: null);
"${alias}" = null;
});
}) virtualHosts; }) virtualHosts;