Merge branch 'master' of https://code-repo.d4science.org/InfraScience/ansible-playbooks
This commit is contained in:
commit
3560b9b2cf
|
@ -2,7 +2,6 @@
|
||||||
# solr
|
# solr
|
||||||
solr_http_port: 8983
|
solr_http_port: 8983
|
||||||
tomcat_load_additional_default_conf: True
|
tomcat_load_additional_default_conf: True
|
||||||
tomcat_version: 7
|
|
||||||
# solr needs a lot of time to start if it needs to rebuild its indices
|
# solr needs a lot of time to start if it needs to rebuild its indices
|
||||||
tomcat_restart_timeout: 100000
|
tomcat_restart_timeout: 100000
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
#tomcat_version: 7
|
tomcat_version: 7
|
||||||
#tomcat_catalina_home_dir: '/usr/share/tomcat{{ tomcat_version }}'
|
#tomcat_catalina_home_dir: '/usr/share/tomcat{{ tomcat_version }}'
|
||||||
# Disable the main tomcat instance
|
# Disable the main tomcat instance
|
||||||
tomcat_service_enabled: False
|
tomcat_service_enabled: False
|
||||||
|
@ -32,7 +32,7 @@ tomcat_m_manager_status_r: "manager-status"
|
||||||
tomcat_m_instances_base_path: '/var/lib/tomcat_instances'
|
tomcat_m_instances_base_path: '/var/lib/tomcat_instances'
|
||||||
tomcat_m_instances_logdir_base: '/var/log/tomcat_instances'
|
tomcat_m_instances_logdir_base: '/var/log/tomcat_instances'
|
||||||
tomcat_m_cache_base: '/var/cache/tomcat-instances'
|
tomcat_m_cache_base: '/var/cache/tomcat-instances'
|
||||||
tomcat_m_default_user: tomcat7
|
tomcat_m_default_user: 'tomcat{{ tomcat_version }}'
|
||||||
tomcat_m_use_default_user: True
|
tomcat_m_use_default_user: True
|
||||||
tomcat_m_user_home: False
|
tomcat_m_user_home: False
|
||||||
tomcat_m_default_user_shell: /bin/false
|
tomcat_m_default_user_shell: /bin/false
|
||||||
|
|
Loading…
Reference in New Issue