From a28bdd09ec1aae3084160e637d3c8495b2b6b107 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 12 Apr 2019 15:50:53 +0200 Subject: [PATCH 1/2] solr-tomcat-instance: Remove the 'tomcat_version' variable. --- solr-tomcat-instance/defaults/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/solr-tomcat-instance/defaults/main.yml b/solr-tomcat-instance/defaults/main.yml index 5ae54a96..b0af2daf 100644 --- a/solr-tomcat-instance/defaults/main.yml +++ b/solr-tomcat-instance/defaults/main.yml @@ -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 From 7d714a064748939c975585fdeff46dcc2f067f4f Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 12 Apr 2019 15:51:37 +0200 Subject: [PATCH 2/2] tomcat-multiple-instances: the tomcat username depends on the tomcat version. --- tomcat-multiple-instances/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tomcat-multiple-instances/defaults/main.yml b/tomcat-multiple-instances/defaults/main.yml index a2f6f361..fd6ebd47 100644 --- a/tomcat-multiple-instances/defaults/main.yml +++ b/tomcat-multiple-instances/defaults/main.yml @@ -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