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

Merge branch 'master' of https://code-repo.d4science.org/InfraScience/ansible-playbooks

This commit is contained in:
Roberto Cirillo 2019-04-15 11:19:55 +02:00
parent 8f1ea45d64 7d714a0647
commit 3560b9b2cf
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solr-tomcat-instance/defaults/main.yml
View File

@ -2,7 +2,6 @@
# solr
solr_http_port: 8983
tomcat_load_additional_default_conf: True
tomcat_version: 7
# solr needs a lot of time to start if it needs to rebuild its indices
tomcat_restart_timeout: 100000

4
tomcat-multiple-instances/defaults/main.yml
View File

@ -1,5 +1,5 @@
---
#tomcat_version: 7
tomcat_version: 7
#tomcat_catalina_home_dir: '/usr/share/tomcat{{ tomcat_version }}'
# Disable the main tomcat instance
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_logdir_base: '/var/log/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_user_home: False
tomcat_m_default_user_shell: /bin/false