diff options
| author | tv <tv@krebsco.de> | 2016-12-23 11:52:44 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-12-23 11:52:44 +0100 |
| commit | de44544cebe3cec242d752afcff71a8203b81102 (patch) | |
| tree | e77ed5fc42f9c997d97afcaed3510cb6fdf753ed /nixos/modules/services/web-servers/nginx | |
| parent | d8478c79128cc5220b47ba3fd2f1dccddaa6e31e (diff) | |
| download | nixlib-de44544cebe3cec242d752afcff71a8203b81102.tar nixlib-de44544cebe3cec242d752afcff71a8203b81102.tar.gz nixlib-de44544cebe3cec242d752afcff71a8203b81102.tar.bz2 nixlib-de44544cebe3cec242d752afcff71a8203b81102.tar.lz nixlib-de44544cebe3cec242d752afcff71a8203b81102.tar.xz nixlib-de44544cebe3cec242d752afcff71a8203b81102.tar.zst nixlib-de44544cebe3cec242d752afcff71a8203b81102.zip | |
nginx service: use `default_server` parameter instead of `default` (#21371)
Diffstat (limited to 'nixos/modules/services/web-servers/nginx')
| -rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index c1bceb133126..68a672c42c90 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -117,7 +117,7 @@ let ssl = vhost.enableSSL || vhost.forceSSL; port = if vhost.port != null then vhost.port else (if ssl then 443 else 80); listenString = toString port + optionalString ssl " ssl http2" - + optionalString vhost.default " default"; + + optionalString vhost.default " default_server"; acmeLocation = optionalString vhost.enableACME ('' location /.well-known/acme-challenge { ${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"} @@ -133,9 +133,9 @@ let in '' ${optionalString vhost.forceSSL '' server { - listen 80 ${optionalString vhost.default "default"}; + listen 80 ${optionalString vhost.default "default_server"}; ${optionalString enableIPv6 - ''listen [::]:80 ${optionalString vhost.default "default"};'' + ''listen [::]:80 ${optionalString vhost.default "default_server"};'' } server_name ${serverName} ${concatStringsSep " " vhost.serverAliases}; |