ISTI-ansible-roles
/
ansible-roles
4
0
Fork 3
Code Issues Pull Requests Releases Wiki Activity

library/roles/smartgears/smartgears-nginx-frontend: Fix the nginx template so that whn-manager is always added. See https://support.d4science.org/issues/9209

This commit is contained in:
Andrea Dell'Amico 2017-07-07 13:42:33 +02:00
parent 7507ec0850
commit 1fc1d05687
2 changed files with 5 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

@ -61,6 +61,7 @@ server {
{% for instance in tomcat_m_instances %} {% for instance in tomcat_m_instances %}
{% for context in instance.app_contexts %} {% for context in instance.app_contexts %}
{% if context != "whn-manager" %} {% if context != "whn-manager" %}
{% if context != '' %}
location /{{ context }} { location /{{ context }} {
{% if smartgears_nginx_cors_enabled %} {% if smartgears_nginx_cors_enabled %}
include /etc/nginx/snippets/nginx-cors.conf; include /etc/nginx/snippets/nginx-cors.conf;
@ -68,6 +69,7 @@ server {
proxy_pass http://localhost:{{ item.http_port }}/{{ context }}; proxy_pass http://localhost:{{ item.http_port }}/{{ context }};
} }
{% endif %} {% endif %}
{% endif %}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% if smart_executor_install is defined and smart_executor_install %} {% if smart_executor_install is defined and smart_executor_install %}
@ -166,6 +168,7 @@ server {
{% for instance in tomcat_m_instances %} {% for instance in tomcat_m_instances %}
{% for context in instance.app_contexts %} {% for context in instance.app_contexts %}
{% if context != "whn-manager" %} {% if context != "whn-manager" %}
{% if context != '' %}
location /{{ context }} { location /{{ context }} {
{% if smartgears_nginx_cors_enabled %} {% if smartgears_nginx_cors_enabled %}
include /etc/nginx/snippets/nginx-cors.conf; include /etc/nginx/snippets/nginx-cors.conf;
@ -173,6 +176,7 @@ server {
proxy_pass http://localhost:{{ item.http_port }}/{{ context }}; proxy_pass http://localhost:{{ item.http_port }}/{{ context }};
} }
{% endif %} {% endif %}
{% endif %}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% if smart_executor_install is defined and smart_executor_install %} {% if smart_executor_install is defined and smart_executor_install %}

2
smartgears/smartgears/defaults/main.yml
View File

@ -49,7 +49,7 @@ smartgears_service_name: 'tomcat-instance-{{ smartgears_http_port }}'
smartgears_loglevel: WARN smartgears_loglevel: WARN
smartgears_tomcat_contexts: [ 'whn-manager' ] smartgears_tomcat_contexts: [ '' ]
# The iptables rules use this # The iptables rules use this