tpiccioli
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

generic-smartgears-virtualhost: fix the server_name directive.

This commit is contained in:
Andrea Dell'Amico 2017-09-24 13:58:34 +02:00
parent 2d909ff031
commit 3254530eab
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smartgears/smartgears-nginx-frontend/templates/generic-smartgears-virtualhost.j2
View File

@ -4,7 +4,7 @@ server {
{% if egi_image is defined and egi_image %} {% if egi_image is defined and egi_image %}
# No servername into the EGI images # No servername into the EGI images
{% elif hostname is defined %} {% elif hostname is defined %}
servername _; server_name _;
{% else %} {% else %}
server_name {{ item.servername }} {% if smartgears_nginx_serveraliases is defined %}{% for vh in smartgears_nginx_serveraliases %} {{ vh }}{% endfor %}{% endif %}; server_name {{ item.servername }} {% if smartgears_nginx_serveraliases is defined %}{% for vh in smartgears_nginx_serveraliases %} {{ vh }}{% endfor %}{% endif %};
{% endif %} {% endif %}
@ -133,6 +133,8 @@ server {
client_max_body_size {{ nginx_client_max_body_size | default('100M') }}; client_max_body_size {{ nginx_client_max_body_size | default('100M') }};
{% if egi_image is defined and egi_image %} {% if egi_image is defined and egi_image %}
# No servername into the EGI images # No servername into the EGI images
{% elif hostname is defined %}
server_name _;
{% else %} {% else %}
server_name {{ item.servername }} {% if smartgears_nginx_serveraliases is defined %}{% for vh in smartgears_nginx_serveraliases %} {{ vh }}{% endfor %}{% endif %}; server_name {{ item.servername }} {% if smartgears_nginx_serveraliases is defined %}{% for vh in smartgears_nginx_serveraliases %} {{ vh }}{% endfor %}{% endif %};
{% endif %} {% endif %}