update..
This commit is contained in:
parent
3061cbac23
commit
8597b0ce8a
@ -23,6 +23,8 @@
|
|||||||
with_items: "{{ samba_shares }}"
|
with_items: "{{ samba_shares }}"
|
||||||
loop_control:
|
loop_control:
|
||||||
label: '{{ item.name }}'
|
label: '{{ item.name }}'
|
||||||
|
when:
|
||||||
|
- "groups['samba_server']|string is search(inventory_hostname)"
|
||||||
tags:
|
tags:
|
||||||
- samba-shares
|
- samba-shares
|
||||||
|
|
||||||
@ -89,12 +91,15 @@
|
|||||||
stat:
|
stat:
|
||||||
path: /root/bin/samba/clean_samba_trash.sh
|
path: /root/bin/samba/clean_samba_trash.sh
|
||||||
register: clean_samba_trash_exists
|
register: clean_samba_trash_exists
|
||||||
|
when:
|
||||||
|
- "groups['samba_server']|string is search(inventory_hostname)"
|
||||||
|
|
||||||
- name: (samba-install.yml) Adjust configuration for script 'clean_samba_trash.sh'
|
- name: (samba-install.yml) Adjust configuration for script 'clean_samba_trash.sh'
|
||||||
template:
|
template:
|
||||||
dest: /root/bin/samba/conf/clean_samba_trash.conf
|
dest: /root/bin/samba/conf/clean_samba_trash.conf
|
||||||
src: root/bin/samba/conf/clean_samba_trash.conf.j2
|
src: root/bin/samba/conf/clean_samba_trash.conf.j2
|
||||||
when:
|
when:
|
||||||
|
- "groups['samba_server']|string is search(inventory_hostname)"
|
||||||
- clean_samba_trash_exists.stat.exists|bool
|
- clean_samba_trash_exists.stat.exists|bool
|
||||||
tags:
|
tags:
|
||||||
- samba-server
|
- samba-server
|
||||||
@ -108,6 +113,9 @@
|
|||||||
check_mode: yes
|
check_mode: yes
|
||||||
changed_when: false
|
changed_when: false
|
||||||
register: clean_samba_trash_dirs
|
register: clean_samba_trash_dirs
|
||||||
|
when:
|
||||||
|
- "groups['samba_server']|string is search(inventory_hostname)"
|
||||||
|
|
||||||
|
|
||||||
- name: Creates a cron job for cleaning up samba trash dirs
|
- name: Creates a cron job for cleaning up samba trash dirs
|
||||||
cron:
|
cron:
|
||||||
@ -120,6 +128,7 @@
|
|||||||
user: "{{ samba_cronjob_trash_dirs.user | default('root') }}"
|
user: "{{ samba_cronjob_trash_dirs.user | default('root') }}"
|
||||||
job: "{{ samba_cronjob_trash_dirs.job }}"
|
job: "{{ samba_cronjob_trash_dirs.job }}"
|
||||||
when:
|
when:
|
||||||
|
- "groups['samba_server']|string is search(inventory_hostname)"
|
||||||
- clean_samba_trash_dirs.found
|
- clean_samba_trash_dirs.found
|
||||||
|
|
||||||
|
|
||||||
@ -131,26 +140,20 @@
|
|||||||
stat:
|
stat:
|
||||||
path: /root/bin/samba/set_permissions_samba_shares.sh
|
path: /root/bin/samba/set_permissions_samba_shares.sh
|
||||||
register: set_permissions_on_samba_shares_exists
|
register: set_permissions_on_samba_shares_exists
|
||||||
|
when:
|
||||||
|
- "groups['samba_server']|string is search(inventory_hostname)"
|
||||||
|
|
||||||
- name: (samba-install.yml) Adjust configuration for script 'set_permissions_samba_shares.sh'
|
- name: (samba-install.yml) Adjust configuration for script 'set_permissions_samba_shares.sh'
|
||||||
template:
|
template:
|
||||||
dest: /root/bin/samba/conf/set_permissions_samba_shares.conf
|
dest: /root/bin/samba/conf/set_permissions_samba_shares.conf
|
||||||
src: root/bin/samba/conf/set_permissions_samba_shares.conf.j2
|
src: root/bin/samba/conf/set_permissions_samba_shares.conf.j2
|
||||||
when:
|
when:
|
||||||
|
- "groups['samba_server']|string is search(inventory_hostname)"
|
||||||
- set_permissions_on_samba_shares_exists.stat.exists|bool
|
- set_permissions_on_samba_shares_exists.stat.exists|bool
|
||||||
tags:
|
tags:
|
||||||
- samba-server
|
- samba-server
|
||||||
|
|
||||||
|
|
||||||
- name: Check if cleaning up trash dirs is configured
|
|
||||||
lineinfile:
|
|
||||||
path: /root/bin/samba/conf/clean_samba_trash.conf
|
|
||||||
regexp: "^trash_dirs=*"
|
|
||||||
state: absent
|
|
||||||
check_mode: yes
|
|
||||||
changed_when: false
|
|
||||||
register: set_permissions_samba_shares
|
|
||||||
|
|
||||||
- name: Creates a cron job for cleaning up samba trash dirs
|
- name: Creates a cron job for cleaning up samba trash dirs
|
||||||
cron:
|
cron:
|
||||||
name: '{{ samba_cronjob_permissions.name }}'
|
name: '{{ samba_cronjob_permissions.name }}'
|
||||||
@ -162,7 +165,8 @@
|
|||||||
user: "{{ samba_cronjob_permissions.user | default('root') }}"
|
user: "{{ samba_cronjob_permissions.user | default('root') }}"
|
||||||
job: "{{ samba_cronjob_permissions.job }}"
|
job: "{{ samba_cronjob_permissions.job }}"
|
||||||
when:
|
when:
|
||||||
- set_permissions_samba_shares.found
|
- "groups['samba_server']|string is search(inventory_hostname)"
|
||||||
|
- clean_samba_trash_dirs.found
|
||||||
|
|
||||||
|
|
||||||
# ---
|
# ---
|
||||||
|
@ -54,10 +54,10 @@
|
|||||||
enabled: yes
|
enabled: yes
|
||||||
state: started
|
state: started
|
||||||
|
|
||||||
- name: "(ubuntu-x11vnc-1604-amd64.yml) Blocks x11vnc in GreenOS Desktop Environment for enduser "
|
# - name: "(ubuntu-x11vnc-1604-amd64.yml) Blocks x11vnc in GreenOS Desktop Environment for enduser "
|
||||||
file:
|
# file:
|
||||||
path: "/usr/share/applications/x11vnc.desktop"
|
# path: "/usr/share/applications/x11vnc.desktop"
|
||||||
mode: 0740
|
# mode: 0740
|
||||||
owner: root
|
# owner: root
|
||||||
group: administrator
|
# group: administrator
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user