From 5ea72ab013b6b49ab8f44f337b422d9d1ee802db Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Tue, 9 Aug 2016 16:56:21 +0200 Subject: [PATCH] library/roles/dnet_user_services_perms: Various fixes when the user is not the standard 'dnet'. --- dnet_user_services_perms/defaults/main.yml | 2 +- dnet_user_services_perms/templates/dnet-sudoers.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dnet_user_services_perms/defaults/main.yml b/dnet_user_services_perms/defaults/main.yml index 7c7017c0..4320c6da 100644 --- a/dnet_user_services_perms/defaults/main.yml +++ b/dnet_user_services_perms/defaults/main.yml @@ -1,7 +1,7 @@ --- dnet_standard_installation: True dnet_user: dnet -dnet_group: dnet +dnet_group: '{{ dnet_user }}' dnet_sudoers_group: dnetsu dnet_data_directories: diff --git a/dnet_user_services_perms/templates/dnet-sudoers.j2 b/dnet_user_services_perms/templates/dnet-sudoers.j2 index b5e66d42..8b051d3b 100644 --- a/dnet_user_services_perms/templates/dnet-sudoers.j2 +++ b/dnet_user_services_perms/templates/dnet-sudoers.j2 @@ -1,3 +1,3 @@ -%{{ dnet_sudoers_group }} ALL=(ALL) NOPASSWD: {% if tomcat_m_instances is defined %}/etc/init.d/tomcat7, /etc/init.d/tomcat-instance-*{% endif %} {% if dnet_sudo_commands is defined %},{% for cmd in dnet_sudo_commands %}{{ cmd }}{% if not loop.last %},{% endif %}{% endfor %}{% endif %} +%{{ dnet_sudoers_group }} ALL=(ALL) NOPASSWD: {% if tomcat_m_instances is defined %}/etc/init.d/tomcat7, /etc/init.d/tomcat-instance-*{% endif %}{% if dnet_sudo_commands is defined %}{% if tomcat_m_instances is defined %}, {% endif %}{% for cmd in dnet_sudo_commands %}{{ cmd }}{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}