library/roles/d4s_user_services_perms: Various fixes.

This commit is contained in:
Andrea Dell'Amico 2016-09-27 15:32:39 +02:00
parent e8ffed284b
commit 7a248878de
3 changed files with 7 additions and 7 deletions

View File

@ -3,7 +3,7 @@
- name: Install the README file that explains where the options files are placed and how start/stop the service - name: Install the README file that explains where the options files are placed and how start/stop the service
template: src={{ item }}-service.j2 dest={{ d4science_user_home }}/{{ item }} mode=0444 template: src={{ item }}-service.j2 dest={{ d4science_user_home }}/{{ item }} mode=0444
with_items: with_items:
- 'README-service' - 'README'
- name: Install the script that allows the d4science user to start and stop the service without using the full path - name: Install the script that allows the d4science user to start and stop the service without using the full path
template: src={{ item }}.j2 dest=/home/{{ d4science_user }}/{{ item }} owner={{ d4science_user }} group={{ d4science_user }} mode=0755 template: src={{ item }}.j2 dest=/home/{{ d4science_user }}/{{ item }} owner={{ d4science_user }} group={{ d4science_user }} mode=0755

View File

@ -6,14 +6,14 @@
- name: Install the script that allows the tomcat user to start and stop the service without using the full path - name: Install the script that allows the tomcat user to start and stop the service without using the full path
template: src={{ item.1 }}.j2 dest={{ item.0.user_home }}/{{ item.1 }} owner={{ item.0.user }} group={{ item.0.user }} mode=0755 template: src={{ item.1 }}.j2 dest={{ item.0.user_home }}/{{ item.1 }} owner={{ item.0.user }} group={{ item.0.user }} mode=0755
with_nested: with_nested:
- '{{ tomcat_m_instances }}' - '{{ tomcat_m_instances | default([]) }}'
- [ 'startContainer.sh', 'stopContainer.sh' ] - [ 'startContainer.sh', 'stopContainer.sh' ]
tags: [ 'tomcat', 'd4science', 'sudo' ] tags: [ 'tomcat', 'd4science', 'sudo' ]
- name: Install the README file that explains where the options files are placed and how start/stop the service - name: Install the README file that explains where the options files are placed and how start/stop the service
template: src={{ item.1 }}.j2 dest={{ item.0.user_home }}/{{ item.1 }} owner={{ item.0.user }} group={{ item.0.user }} mode=0444 template: src={{ item.1 }}.j2 dest={{ item.0.user_home }}/{{ item.1 }} owner={{ item.0.user }} group={{ item.0.user }} mode=0444
with_nested: with_nested:
- '{{ tomcat_m_instances }}' - '{{ tomcat_m_instances | default([]) }}'
- [ 'README' ] - [ 'README' ]
tags: [ 'tomcat', 'd4science', 'd4s_readme' ] tags: [ 'tomcat', 'd4science', 'd4s_readme' ]
@ -26,12 +26,12 @@
- name: Set the read/write permissions on the tomcat default options files - name: Set the read/write permissions on the tomcat default options files
acl: name=/etc/default/tomcat-instance-{{ item.http_port }} entity={{ item.user }} etype=user permissions=rw state=present acl: name=/etc/default/tomcat-instance-{{ item.http_port }} entity={{ item.user }} etype=user permissions=rw state=present
with_items: '{{ tomcat_m_instances }}' with_items: '{{ tomcat_m_instances | default([]) }}'
tags: [ 'tomcat', 'd4science', 'acl' ] tags: [ 'tomcat', 'd4science', 'acl' ]
- name: Set the read/write permissions on the tomcat default local 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 acl: name=/etc/default/tomcat-instance-{{ item.http_port }}.local entity={{ item.user }} etype=user permissions=rw state=present
with_items: '{{ tomcat_m_instances }}' with_items: '{{ tomcat_m_instances | default([]) }}'
tags: [ 'tomcat', 'd4science', 'acl' ] tags: [ 'tomcat', 'd4science', 'acl' ]
ignore_errors: True ignore_errors: True

View File

@ -10,7 +10,7 @@
- name: Install the README file that explains where the options files are placed and how start/stop the service - name: Install the README file that explains where the options files are placed and how start/stop the service
template: src={{ item.1 }}.j2 dest={{ item.0.user_home }}/{{ item.1 }} owner={{ item.0.user }} group={{ item.0.user }} mode=0444 template: src={{ item.1 }}.j2 dest={{ item.0.user_home }}/{{ item.1 }} owner={{ item.0.user }} group={{ item.0.user }} mode=0444
with_nested: with_nested:
- '{{ tomcat_m_instances }}' - '{{ tomcat_m_instances | default([]) }}'
- [ 'README-tomcat' ] - [ 'README-tomcat' ]
when: tomcat_m_instances is defined when: tomcat_m_instances is defined
tags: [ 'tomcat', 'd4science', 'd4s_readme' ] tags: [ 'tomcat', 'd4science', 'd4s_readme' ]