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

Remove some conditionals from the wps-config-fixer script. Add a new tag and variable to the dataminer tasks that install and run the script so that we can force a tomcat restart.

This commit is contained in:
Andrea Dell'Amico 2018-12-13 12:03:17 +01:00
parent 3765cedc5b
commit 43c57522f1
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
prometheus-alert-manager/tasks/main.yml Normal file
View File

11
smartgears/dataminer_app/templates/wps-config-fixer.j2
View File

@ -10,19 +10,14 @@ sed -Ei 's/hostname=\".*\"\ hostport/hostname="{{ hostname }}" hostport/' "$WPS_
sed -Ei 's/hostname=\".*\"\ hostport/hostname="{{ smartgears_hostname }}" hostport/' "$WPS_CONFIG_FILE"
{% endif %}
# Fix the port
# 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
{% if setup_nginx %}
{% if https_port is defined %}
# {% if http_redirect_to_https is defined and http_redirect_to_https %}
sed -Ei 's/hostport=\".*\"\ includeDataInputsInResponse/hostport="{{ https_port }}" includeDataInputsInResponse/' "$WPS_CONFIG_FILE"
sed -Ei 's/protocol=\".*\"\ hostname/protocol="https" hostname/' "$WPS_CONFIG_FILE"
# {% else %}
# sed -Ei 's/hostport=\".*\"\ includeDataInputsInResponse/hostport="{{ http_port }}" includeDataInputsInResponse/' "$WPS_CONFIG_FILE"
#{% endif %}
{% else %}
{% if http_port is defined %}
sed -Ei 's/hostport=\".*\"\ includeDataInputsInResponse/hostport="{{ http_port }}" includeDataInputsInResponse/' "$WPS_CONFIG_FILE"
{% endif %}
sed -Ei 's/hostport=\".*\"\ includeDataInputsInResponse/hostport="{{ http_port | default('80') }}" includeDataInputsInResponse/' "$WPS_CONFIG_FILE"
{% endif %}
{% else %}
sed -Ei 's/hostport=\".*\"\ includeDataInputsInResponse/hostport="{{ item.http_port }}" includeDataInputsInResponse/' "$WPS_CONFIG_FILE"