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

library/roles/smartgears/smartgears-nginx-frontend: Add the CORS snippet when enabled.

This commit is contained in:
Andrea Dell'Amico 2016-11-28 16:41:06 +01:00
parent 64f8947dd5
commit 00b6c78bb6
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smartgears/smartgears-nginx-frontend/defaults/main.yml
View File

@ -4,3 +4,5 @@ http_redirect_to_https: False
letsencrypt_acme_install: False
smartgears_install_generic_virthost: True
#smartgears_nginx_serveraliases:
smartgears_nginx_cors_enabled: False
nginx_cors_acl_origin: ''

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

@ -59,22 +59,34 @@ server {
{% for instance in tomcat_m_instances %}
{% for context in instance.app_contexts %}
location /{{ context }} {
{% if smartgears_nginx_cors_enabled %}
include /etc/nginx/snippets/nginx-cors.conf;
{% endif %}
proxy_pass http://localhost:{{ item.http_port }}/{{ context }};
}
{% endfor %}
{% endfor %}
{% if smart_executor_install is defined and smart_executor_install %}
location {{ smart_executor_context }} {
{% if smartgears_nginx_cors_enabled %}
include /etc/nginx/snippets/nginx-cors.conf;
{% endif %}
proxy_pass http://localhost:{{ item.http_port }}{{ smart_executor_context }};
}
{% endif %}
{% if rstudio_install_server is defined and rstudio_install_server %}
location / {
{% if smartgears_nginx_cors_enabled %}
include /etc/nginx/snippets/nginx-cors.conf;
{% endif %}
proxy_pass http://localhost:8787/;
}
{% endif %}
{% else %}
location / {
{% if smartgears_nginx_cors_enabled %}
include /etc/nginx/snippets/nginx-cors.conf;
{% endif %}
return 301 https://{{ item.servername }}$request_uri;
}
{% endif %}
@ -143,17 +155,26 @@ server {
{% for instance in tomcat_m_instances %}
{% for context in instance.app_contexts %}
location /{{ context }} {
{% if smartgears_nginx_cors_enabled %}
include /etc/nginx/snippets/nginx-cors.conf;
{% endif %}
proxy_pass http://localhost:{{ item.http_port }}/{{ context }};
}
{% endfor %}
{% endfor %}
{% if smart_executor_install is defined and smart_executor_install %}
location {{ smart_executor_context }} {
{% if smartgears_nginx_cors_enabled %}
include /etc/nginx/snippets/nginx-cors.conf;
{% endif %}
proxy_pass http://localhost:{{ item.http_port }}{{ smart_executor_context }};
}
{% endif %}
{% if rstudio_install_server is defined and rstudio_install_server %}
location / {
{% if smartgears_nginx_cors_enabled %}
include /etc/nginx/snippets/nginx-cors.conf;
{% endif %}
proxy_pass http://localhost:8787/;
}
{% endif %}