From 3254530eab03f92ac92a63305472b73a6d297fe6 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Sun, 24 Sep 2017 13:58:34 +0200 Subject: [PATCH] generic-smartgears-virtualhost: fix the server_name directive. --- .../templates/generic-smartgears-virtualhost.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2 b/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2 index c5998508..a38dbabb 100644 --- a/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2 +++ b/smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2 @@ -4,7 +4,7 @@ server { {% if egi_image is defined and egi_image %} # No servername into the EGI images {% elif hostname is defined %} - servername _; + server_name _; {% else %} server_name {{ item.servername }} {% if smartgears_nginx_serveraliases is defined %}{% for vh in smartgears_nginx_serveraliases %} {{ vh }}{% endfor %}{% endif %}; {% endif %} @@ -133,6 +133,8 @@ server { client_max_body_size {{ nginx_client_max_body_size | default('100M') }}; {% if egi_image is defined and egi_image %} # No servername into the EGI images +{% elif hostname is defined %} + server_name _; {% else %} server_name {{ item.servername }} {% if smartgears_nginx_serveraliases is defined %}{% for vh in smartgears_nginx_serveraliases %} {{ vh }}{% endfor %}{% endif %}; {% endif %}