From db534612f02892c07915fd2a75dec394ae1e4022 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 14 Dec 2018 17:08:15 +0100 Subject: [PATCH] Do not set the protocol and port to https until when https://support.d4science.org/issues/13024 if fixed and the new dataminer deployed --- smartgears/dataminer_app/templates/wps-config-fixer.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/smartgears/dataminer_app/templates/wps-config-fixer.j2 b/smartgears/dataminer_app/templates/wps-config-fixer.j2 index e14af31a..873763d5 100644 --- a/smartgears/dataminer_app/templates/wps-config-fixer.j2 +++ b/smartgears/dataminer_app/templates/wps-config-fixer.j2 @@ -12,10 +12,11 @@ sed -Ei 's/hostname=\".*\"\ hostport/hostname="{{ smartgears_hostname }}" hostpo # Set the port. It is different from the tomcat one if there is a reverse proxy before the service. # https has the precedence if it is available +# TODO: change back to http and https_port when https://support.d4science.org/issues/13024 if fixed and the new dataminer deployed {% if setup_nginx %} {% if https_port is defined %} -sed -Ei 's/hostport=\".*\"\ includeDataInputsInResponse/hostport="{{ https_port }}" includeDataInputsInResponse/' "$WPS_CONFIG_FILE" -sed -Ei 's/protocol=\".*\"\ hostname/protocol="https" hostname/' "$WPS_CONFIG_FILE" +sed -Ei 's/hostport=\".*\"\ includeDataInputsInResponse/hostport="{{ http_port | default('80') }}" includeDataInputsInResponse/' "$WPS_CONFIG_FILE" +sed -Ei 's/protocol=\".*\"\ hostname/protocol="http" hostname/' "$WPS_CONFIG_FILE" {% else %} sed -Ei 's/hostport=\".*\"\ includeDataInputsInResponse/hostport="{{ http_port | default('80') }}" includeDataInputsInResponse/' "$WPS_CONFIG_FILE" {% endif %}