Merge branch 'master' into 4.x

wodby · Feb 14, 2018 · b54b31c · b54b31c
2 parents 83b150d + 2021dbe
commit b54b31c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/templates/d6-vhost.conf.tpl b/templates/d6-vhost.conf.tpl
@@ -10,7 +10,7 @@ map $http_x_forwarded_proto $fastcgi_https {
 
 server {
     server_name {{ getenv "NGINX_SERVER_NAME" "drupal" }};
-    listen 80;
+    listen 80 default_server{{ if getenv "NGINX_HTTP2" }} http2{{ end }};
 
     root {{ getenv "NGINX_SERVER_ROOT" "/var/www/html/" }};
     index index.php;

diff --git a/templates/d7-vhost.conf.tpl b/templates/d7-vhost.conf.tpl
@@ -10,7 +10,7 @@ map $http_x_forwarded_proto $fastcgi_https {
 
 server {
     server_name {{ getenv "NGINX_SERVER_NAME" "drupal" }};
-    listen 80;
+    listen 80 default_server{{ if getenv "NGINX_HTTP2" }} http2{{ end }};
 
     root {{ getenv "NGINX_SERVER_ROOT" "/var/www/html/" }};
     index index.php;

diff --git a/templates/d8-vhost.conf.tpl b/templates/d8-vhost.conf.tpl
@@ -10,7 +10,7 @@ map $http_x_forwarded_proto $fastcgi_https {
 
 server {
     server_name {{ getenv "NGINX_SERVER_NAME" "drupal" }};
-    listen 80;
+    listen 80 default_server{{ if getenv "NGINX_HTTP2" }} http2{{ end }};
 
     root {{ getenv "NGINX_SERVER_ROOT" "/var/www/html/" }};
     index index.php;