BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nginx module: fix acme if vhost name != serverName

Browse source 
cc #21931 @bobvanderlinden
This commit is contained in:
Franz Pletz 2017-02-25 08:03:14 +01:00
parent e564a399d9
commit 3a4dd97c55
No known key found for this signature in database
GPG key ID: 846FDED7792617B4
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/services/web-servers/nginx/default.nix
View file

@ -5,13 +5,16 @@ with lib;
let let
cfg = config.services.nginx; cfg = config.services.nginx;
virtualHosts = mapAttrs (vhostName: vhostConfig: virtualHosts = mapAttrs (vhostName: vhostConfig:
vhostConfig // { let
serverName = if vhostConfig.serverName != null serverName = if vhostConfig.serverName != null
then vhostConfig.serverName then vhostConfig.serverName
else vhostName; else vhostName;
in
vhostConfig // {
inherit serverName;
} // (optionalAttrs vhostConfig.enableACME { } // (optionalAttrs vhostConfig.enableACME {
sslCertificate = "/var/lib/acme/${vhostName}/fullchain.pem"; sslCertificate = "/var/lib/acme/${serverName}/fullchain.pem";
sslCertificateKey = "/var/lib/acme/${vhostName}/key.pem"; sslCertificateKey = "/var/lib/acme/${serverName}/key.pem";
}) })
) cfg.virtualHosts; ) cfg.virtualHosts;
enableIPv6 = config.networking.enableIPv6; enableIPv6 = config.networking.enableIPv6;