From a745a6a46f154bc6baf759fd5fef82ec566ffba5 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 19 Apr 2017 19:19:24 +0200 Subject: [PATCH] library/roles/tomcat-multiple-instances/tasks/main.yml: Fix defaults for the users creation. --- tomcat-multiple-instances/tasks/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tomcat-multiple-instances/tasks/main.yml b/tomcat-multiple-instances/tasks/main.yml index ae199c4..c5f799c 100644 --- a/tomcat-multiple-instances/tasks/main.yml +++ b/tomcat-multiple-instances/tasks/main.yml @@ -8,14 +8,12 @@ tags: [ 'tomcat', 'tomcat_instances' ] - name: Create a tomcat user for each instance if needed - user: name={{ item.user }} home={{ item.user_home }} createhome=false shell={{ item.user_shell }} + user: name={{ item.user }} home={{ item.user_home }} createhome=false shell={{ item.user_shell | default('/bin/false') }} with_items: '{{ tomcat_m_instances }}' when: - not tomcat_m_use_default_user - item.user != "tomcat{{ tomcat_version }}" - - item.user_shell is defined register: tomcat_first_install - ignore_errors: True tags: [ 'tomcat', 'tomcat_instances' ] - name: Create a tomcat user if needed @@ -24,7 +22,6 @@ - tomcat_m_use_default_user - tomcat_m_default_user != "tomcat{{ tomcat_version }}" register: tomcat_first_install - ignore_errors: True tags: [ 'tomcat', 'tomcat_instances' ] - name: Create the instances directory trees