From de44544cebe3cec242d752afcff71a8203b81102 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 23 Dec 2016 11:52:44 +0100 Subject: [PATCH] nginx service: use `default_server` parameter instead of `default` (#21371) --- nixos/modules/services/web-servers/nginx/default.nix | 6 +++--- 1 file 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 c1bceb13312..68a672c42c9 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};