From 29aab30b458f06cab6efa962dc500e393726b84e Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 24 Jul 2015 12:46:24 +0200 Subject: [PATCH] library/roles/ubuntu-deb-general/tasks/packages.yml: use a specific tag to identify the task that installs the common packages library/roles/d4s_user_services_perms/tasks/main.yml: Fix the acl tasks --- d4s_user_services_perms/tasks/main.yml | 22 +++++++++++++--------- ubuntu-deb-general/tasks/packages.yml | 3 +-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/d4s_user_services_perms/tasks/main.yml b/d4s_user_services_perms/tasks/main.yml index 58cd4891..7505dc46 100644 --- a/d4s_user_services_perms/tasks/main.yml +++ b/d4s_user_services_perms/tasks/main.yml @@ -17,17 +17,21 @@ - [ 'README' ] tags: [ 'tomcat', 'd4science', 'd4s_readme' ] +# - name: Set the read/write permissions on the tomcat default options files +# acl: name={{ item.1 }} entity={{ item.0.user }} etype=user permissions=rw state=present +# with_nested: +# - '{{ tomcat_m_instances }}' +# - '{{ d4science_tomcat_options_files }}' +# tags: [ 'tomcat', 'd4science', 'acl' ] + - name: Set the read/write permissions on the tomcat default options files - acl: name={{ item.1 }} entity={{ item.0.user }} etype=user permissions=rw state=present - with_nested: - - '{{ tomcat_m_instances }}' - - '{{ d4science_tomcat_options_files }}' + acl: name=/etc/default/tomcat-instance-{{ item.http_port }} entity={{ item.user }} etype=user permissions=rw state=present + with_items: tomcat_m_instances tags: [ 'tomcat', 'd4science', 'acl' ] -- name: Set the default read/write permissions on the tomcat default options files - acl: name={{ item.1 }} entity={{ item.0.user }} etype=user permissions=rw state=present default=yes - with_nested: - - '{{ tomcat_m_instances }}' - - '{{ d4science_tomcat_options_files }}' +- name: Set the read/write permissions on the tomcat default local options files + acl: name=/etc/default/tomcat-instance-{{ item.http_port }}.local entity={{ item.user }} etype=user permissions=rw state=present + with_items: tomcat_m_instances tags: [ 'tomcat', 'd4science', 'acl' ] + diff --git a/ubuntu-deb-general/tasks/packages.yml b/ubuntu-deb-general/tasks/packages.yml index 952e29aa..52ff5ae5 100644 --- a/ubuntu-deb-general/tasks/packages.yml +++ b/ubuntu-deb-general/tasks/packages.yml @@ -76,8 +76,7 @@ apt: pkg={{ item }} state=installed when: has_apt with_items: common_packages - tags: - - packages + tags: [ 'packages', 'common_pkgs' ] - name: Install the ntp server apt: pkg=ntp state=installed