From e642ffb6480cbb0dbb49387e41bf07e9314eaa35 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 15 Jul 2016 19:49:31 +0200 Subject: [PATCH 1/2] infrastructure-services: Some cleanups --- smartgears/smartgears/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smartgears/smartgears/defaults/main.yml b/smartgears/smartgears/defaults/main.yml index b473f00..b9448ef 100644 --- a/smartgears/smartgears/defaults/main.yml +++ b/smartgears/smartgears/defaults/main.yml @@ -33,7 +33,7 @@ smartgears_service_name: 'tomcat-instance-{{ smartgears_http_port }}' smartgears_loglevel: WARN smartgears_tomcat_contexts: - - whn-manager + whn-manager smartgears_define_context_vo: False smartgears_context: '/smart-executor' smartgears_contexts_list: From 4d53951c939d2f16e158afe49dbef7e1dd436e67 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 15 Jul 2016 19:55:04 +0200 Subject: [PATCH 2/2] library/roles/smartgears/smartgears/defaults/main.yml: The tomcat app contexts is an array. --- smartgears/smartgears/defaults/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/smartgears/smartgears/defaults/main.yml b/smartgears/smartgears/defaults/main.yml index b9448ef..a8ce8e8 100644 --- a/smartgears/smartgears/defaults/main.yml +++ b/smartgears/smartgears/defaults/main.yml @@ -32,8 +32,7 @@ smartgears_service_name: 'tomcat-instance-{{ smartgears_http_port }}' smartgears_loglevel: WARN -smartgears_tomcat_contexts: - whn-manager +smartgears_tomcat_contexts: [ 'whn-manager' ] smartgears_define_context_vo: False smartgears_context: '/smart-executor' smartgears_contexts_list: @@ -55,7 +54,7 @@ http_port: '{{ smartgears_http_port }}' tomcat_m_webapps_unpack: True tomcat_m_instances: - - { http_enabled: True, http_port: '{{ smartgears_http_port }}', http_address: '0.0.0.0', ajp_enabled: False, ajp_port: '8109', ajp_address: '127.0.0.1', restart_timeout: '{{ tomcat_m_restart_timeout }}', shutdown_port: '-1', java_home: '{{ jdk_java_home }}', user: '{{ smartgears_user }}', user_home: '{{ smartgears_user_home }}', user_shell: '{{ tomcat_m_default_user_shell }}', instance_path: '{{ smartgears_instance_path }}', max_threads: '{{ tomcat_m_max_threads }}', autodeploy: '{{ tomcat_m_webapps_autodeploy }}', unpack: '{{ tomcat_m_webapps_unpack }}', default_conf: True, java_opts: '{{ tomcat_m_java_opts }}', java_gc_opts: '{{ tomcat_m_java_gc_opts }}', other_java_opts: '{{ tomcat_m_other_java_opts }}', remote_debugging: '{{ tomcat_m_enable_remote_debugging }}', remote_debugging_port: '{{ smartgears_debugging_port }}' , access_log_enabled: True, log_rotation_freq: daily, log_retain: 30, allowed_hosts: [ '0.0.0.0/0' ], app_contexts: [ '{{ smartgears_tomcat_contexts }}' ], servername: '{{ ansible_fqdn }}' } + - { http_enabled: True, http_port: '{{ smartgears_http_port }}', http_address: '0.0.0.0', ajp_enabled: False, ajp_port: '8109', ajp_address: '127.0.0.1', restart_timeout: '{{ tomcat_m_restart_timeout }}', shutdown_port: '-1', java_home: '{{ jdk_java_home }}', user: '{{ smartgears_user }}', user_home: '{{ smartgears_user_home }}', user_shell: '{{ tomcat_m_default_user_shell }}', instance_path: '{{ smartgears_instance_path }}', max_threads: '{{ tomcat_m_max_threads }}', autodeploy: '{{ tomcat_m_webapps_autodeploy }}', unpack: '{{ tomcat_m_webapps_unpack }}', default_conf: True, java_opts: '{{ tomcat_m_java_opts }}', java_gc_opts: '{{ tomcat_m_java_gc_opts }}', other_java_opts: '{{ tomcat_m_other_java_opts }}', remote_debugging: '{{ tomcat_m_enable_remote_debugging }}', remote_debugging_port: '{{ smartgears_debugging_port }}' , access_log_enabled: True, log_rotation_freq: daily, log_retain: 30, allowed_hosts: [ '0.0.0.0/0' ], app_contexts: '{{ smartgears_tomcat_contexts }}', servername: '{{ ansible_fqdn }}' } # To enable debugging: # - Set