update..

roles/common/tasks/samba-install.yml

@@ -107,76 +107,73 @@
     - samba-server
 
 
-- name: (samba-install.yml) Check if cleaning up trash dirs is configured
-  lineinfile:
+- name: (samba-config-server.yml) Check if cleaning up trash dirs is configured
+  ansible.builtin.lineinfile:
     path: /root/bin/samba/conf/clean_samba_trash.conf
-    regexp: "^trash_dirs=*"
+    regexp: '^trash_dirs=*'
     state: absent
-  check_mode: yes
+  check_mode: true
   changed_when: false
   register: clean_samba_trash_dirs
-  when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
-  tags:
-    - samba-server
-
-
-- name: (samba-install.yml) Creates a cron job for cleaning up samba trash dirs
-  cron:
-    name: '{{ samba_cronjob_trash_dirs.name }}'
-    minute: '{{ samba_cronjob_trash_dirs.minute }}'
+  when: 
+    - inventory_hostname in groups['samba_server']
+  tags: [samba-server, samba-cron]
+  
+  
+- name: (samba-config-server.yml) Creates a cron job for cleaning up samba trash dirs
+  ansible.builtin.cron:
+    name: "{{ samba_cronjob_trash_dirs.name }}"
+    minute: "{{ samba_cronjob_trash_dirs.minute }}"
     hour: "{{ samba_cronjob_trash_dirs.hour | default('*') }}"
-    day: "{{ samba_cronjob_trash_dirs.hour.day | default('*') }}"
-    month: "{{ samba_cronjob_trash_dirs.hour.month| default('*') }}"
-    weekday: "{{ samba_cronjob_trash_dirs.hour.weekday| default('*') }}"
+    day: "{{ samba_cronjob_trash_dirs.day | default('*') }}"
+    month: "{{ samba_cronjob_trash_dirs.month | default('*') }}"
+    weekday: "{{ samba_cronjob_trash_dirs.weekday | default('*') }}"
     user: "{{ samba_cronjob_trash_dirs.user | default('root') }}"
     job: "{{ samba_cronjob_trash_dirs.job }}"
   when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
-    - clean_samba_trash_dirs.found
-  tags:
-    - samba-server
+    - inventory_hostname in groups['samba_server']
+    - clean_samba_trash_exists.stat.exists | bool
+    - (clean_samba_trash_dirs.found | int) > 0
+  tags: [samba-server, samba-cron]
 
 
 # ---
 # Cronjob for setting permissions on samba shares
 # ---
 
-- name: (samba-install.yml) Check if file '/root/bin/samba/set_permissions_samba_shares.sh' exists
-  stat:
+- name: (samba-config-server.yml) Check if file '/root/bin/samba/set_permissions_samba_shares.sh' exists
+  ansible.builtin.stat:
     path: /root/bin/samba/set_permissions_samba_shares.sh
   register: set_permissions_on_samba_shares_exists
   when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
-  tags:
-    - samba-server
+    - inventory_hostname in groups['samba_server']
+  tags: [samba-server, samba-cron]
+    
 
-- name: (samba-install.yml) Adjust configuration for script 'set_permissions_samba_shares.sh'
-  template: 
+- name: (samba-config-server.yml) Adjust configuration for script 'set_permissions_samba_shares.sh'
+  ansible.builtin.template:
     dest: /root/bin/samba/conf/set_permissions_samba_shares.conf
     src: root/bin/samba/conf/set_permissions_samba_shares.conf.j2
   when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
-    - set_permissions_on_samba_shares_exists.stat.exists|bool
-  tags:
-    - samba-server
-
-
-- name: (samba-install.yml) Creates a cron job for cleaning up samba trash dirs
-  cron:
-    name: '{{ samba_cronjob_permissions.name }}'
-    minute: '{{ samba_cronjob_permissions.minute }}'
+    - inventory_hostname in groups['samba_server']
+    - set_permissions_on_samba_shares_exists.stat.exists | bool
+  tags: [samba-server, samba-cron]
+  
+    
+- name: (samba-config-server.yml) Creates a cron job for setting permissions to samba dirs
+  ansible.builtin.cron:
+    name: "{{ samba_cronjob_permissions.name }}"
+    minute: "{{ samba_cronjob_permissions.minute }}"
     hour: "{{ samba_cronjob_permissions.hour | default('*') }}"
     day: "{{ samba_cronjob_permissions.day | default('*') }}"
-    month: "{{ samba_cronjob_permissions.month| default('*') }}"
-    weekday: "{{ samba_cronjob_permissions.weekday| default('*') }}"
+    month: "{{ samba_cronjob_permissions.month | default('*') }}"
+    weekday: "{{ samba_cronjob_permissions.weekday | default('*') }}"
     user: "{{ samba_cronjob_permissions.user | default('root') }}"
     job: "{{ samba_cronjob_permissions.job }}"
   when:
-    - "groups['samba_server']|string is search(inventory_hostname)"
-    - clean_samba_trash_dirs.found
-  tags:
-    - samba-server
+    - inventory_hostname in groups['samba_server']
+    - (clean_samba_trash_dirs.found | int) > 0     # << int -> bool
+  tags: [samba-server, samba-cron]
 
 
 # ---