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

Move the data_transfer variables from the nginx role to the main smartgears one.

This commit is contained in:
Andrea Dell'Amico 2017-09-14 17:23:17 +02:00
parent 7378e765f1
commit ea49eb993a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,5 +6,4 @@ smartgears_install_generic_virthost: True
#smartgears_nginx_serveraliases: #smartgears_nginx_serveraliases:
smartgears_nginx_cors_enabled: False smartgears_nginx_cors_enabled: False
nginx_cors_acl_origin: '' nginx_cors_acl_origin: ''
data_transfer_service_install: False
smartgears_nginx_expose_tomcat_logs: False smartgears_nginx_expose_tomcat_logs: False

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

@ -77,3 +77,7 @@ smartgears_debugging_port: '{{ tomcat_m_remote_debugging_port }}'
# tcp_rules: True # tcp_rules: True
# tcp: # tcp:
# - { port: '{{ smartgears_debugging_port }}', allowed_hosts: [ '{{ network.isti }}', '{{ network.nmis }}', '{{ network.eduroam }}' ] } # - { port: '{{ smartgears_debugging_port }}', allowed_hosts: [ '{{ network.isti }}', '{{ network.nmis }}', '{{ network.eduroam }}' ] }
# This is only used to setup the nginx reverse proxy. The data-trasfer war file is always installed
data_transfer_service_install: False
data_trasfer_service_name: data-transfer-service