From df3d8ab3407d83bb7a236111cdc29fd046e1e684 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 9 Sep 2016 13:34:06 +0200 Subject: [PATCH] library/roles/smartgears/smartgears-nginx-frontend/templates/dataminer1-d-d4s.d4science.org-virtualhost.j2: virtualhost for the new dataminer. --- ...aminer1-d-d4s.d4science.org-virtualhost.j2 | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/smartgears/smartgears-nginx-frontend/templates/dataminer1-d-d4s.d4science.org-virtualhost.j2 b/smartgears/smartgears-nginx-frontend/templates/dataminer1-d-d4s.d4science.org-virtualhost.j2 index f62bc42..871b312 100644 --- a/smartgears/smartgears-nginx-frontend/templates/dataminer1-d-d4s.d4science.org-virtualhost.j2 +++ b/smartgears/smartgears-nginx-frontend/templates/dataminer1-d-d4s.d4science.org-virtualhost.j2 @@ -51,15 +51,26 @@ server { proxy_connect_timeout {{ nginx_proxy_connect_timeout }}; proxy_read_timeout {{ nginx_proxy_read_timeout }}; proxy_send_timeout {{ nginx_proxy_send_timeout }}; -{% for instance in tomcat_m_instances %} -{% for context in instance.app_contexts %} + + {% if r_connector_install %} + location /auth-sign-in { + rewrite ^/auth-sign-in http://{{ item.servername }}/r-connector/gcube/service/disconnect; + } + {% endif %} + + {% for instance in tomcat_m_instances %} + {% for context in instance.app_contexts %} location /{{ context }} { proxy_pass http://localhost:{{ item.http_port }}/{{ context }}; } -{% endfor %} -{% endfor %} + {% endfor %} + {% endfor %} location {{ dataminer_52north_webapp_context }} { proxy_pass http://localhost:{{ item.http_port }}{{ dataminer_52north_webapp_context }}; } - + {% if rstudio_install_server %} + location / { + proxy_pass http://localhost:8787/; + } + {% endif %} }