Refactor Ansible tasks and templates for improved consistency and clarity

roles/common/tasks/cups-install.yml

@@ -1,49 +1,52 @@
 ---
 
-
 # ---
 # Cups Server
 # ---
 
 - name: (cups-install.yml) Ensure CUPS packages server (buster) are installed.
-  package:
-    pkg: '{{ apt_install_server_cups }}'
+  ansible.builtin.package:
+    pkg: "{{ apt_install_server_cups }}"
     state: present
   when:
     - ansible_facts['distribution'] == "Debian"
   tags:
     - cups-server
 
-
 # ---
 # Cups clients
 # ---
 
 - name: (cups.yml) Ensure CUPS packages clients are installed.
-  package:
+  ansible.builtin.package:
     pkg: "{{ apt_install_client_cups }}"
     state: present
-  when: 
+  when:
     - ansible_facts['distribution'] == "Ubuntu"
-    - ansible_distribution_version ==  "18.04"
+    - ansible_distribution_version == "18.04"
     - ansible_architecture == "x86_64"
   tags:
     - cups-client
 
-
-
 # -- file /etc/cups/cups-browsed.conf
 - name: (cups.yml) Check if file '/etc/cups/cups-browsed.conf.ORIGi' exists
-  stat:
+  ansible.builtin.stat:
     path: /etc/cups/cups-browsed.conf.ORIG
-  register: cups_browsed_conf_orig_exists
+  register: common_cups_browsed_conf_orig_exists
   tags:
     - cups-server
     - cups-client
 
 - name: (cups.yml) Backup /etc/cups/cups-browsed.conf file
-  command: cp /etc/cups/cups-browsed.conf /etc/cups/cups-browsed.conf.ORIG
-  when: cups_browsed_conf_orig_exists.stat.exists == False
+  ansible.builtin.copy:
+    src: /etc/cups/cups-browsed.conf
+    dest: /etc/cups/cups-browsed.conf.ORIG
+    remote_src: true
+    force: false
+    owner: root
+    group: root
+    mode: "0644"
+  when: not common_cups_browsed_conf_orig_exists.stat.exists
   tags:
     - cups-server
     - cups-client
@@ -54,9 +57,9 @@
     dest: /etc/cups/cups-browsed.conf
     owner: root
     group: root
-    mode: 0644
+    mode: "0644"
   notify:
-     Restart cups-browsed
+    - Restart cups-browsed
   when:
     - groups['file_server']|string is search(inventory_hostname)
   tags:
@@ -68,27 +71,33 @@
     dest: /etc/cups/cups-browsed.conf
     owner: root
     group: root
-    mode: 0644
+    mode: "0644"
   notify:
-     Restart cups-browsed
+    - Restart cups-browsed
   when:
     - groups['client_pc']|string is search(inventory_hostname)
   tags:
     - cups-client
 
-
 # -- file /etc/cups/cupsd.conf
 - name: (cups.yml) Check if file '/etc/cups/cupsd.conf.ORIG' exists
-  stat:
+  ansible.builtin.stat:
     path: /etc/cups/cupsd.conf.ORIG
-  register: cupsd_conf_orig_exists
+  register: common_cupsd_conf_orig_exists
   tags:
     - cups-server
     - cups-client
 
 - name: (cups.yml) Backup /etc/cups/cupsd.conf file
-  command: cp /etc/cups/cupsd.conf /etc/cups/cupsd.conf.ORIG
-  when: cupsd_conf_orig_exists.stat.exists == False
+  ansible.builtin.copy:
+    src: /etc/cups/cupsd.conf
+    dest: /etc/cups/cupsd.conf.ORIG
+    remote_src: true
+    force: false
+    owner: root
+    group: root
+    mode: "0644"
+  when: not common_cupsd_conf_orig_exists.stat.exists
   tags:
     - cups-server
     - cups-client
@@ -99,9 +108,9 @@
     dest: /etc/cups/cupsd.conf
     owner: root
     group: root
-    mode: 0644
+    mode: "0644"
   notify:
-     Restart cups
+    - Restart cups
   when:
     - groups['file_server']|string is search(inventory_hostname)
   tags:
@@ -113,9 +122,9 @@
     dest: /etc/cups/cupsd.conf
     owner: root
     group: root
-    mode: 0644
+    mode: "0644"
   notify:
-     Restart cups
+    - Restart cups
   when:
     - groups['client_pc']|string is search(inventory_hostname)
   tags:
@@ -123,16 +132,23 @@
 
 # -- file /etc/cups/cups-files.conf
 - name: (cups.yml) Check if file '/etc/cups/cups-files.conf.ORIGi' exists
-  stat:
+  ansible.builtin.stat:
     path: /etc/cups/cups-files.conf.ORIG
-  register: cups_files_conf_orig_exists
+  register: common_cups_files_conf_orig_exists
   tags:
     - cups-server
     - cups-client
 
 - name: (cups.yml) Backup /etc/cups/cups-files.conf file
-  command: cp /etc/cups/cups-files.conf /etc/cups/cups-files.conf.ORIG
-  when: cups_files_conf_orig_exists.stat.exists == False
+  ansible.builtin.copy:
+    src: /etc/cups/cups-files.conf
+    dest: /etc/cups/cups-files.conf.ORIG
+    remote_src: true
+    force: false
+    owner: root
+    group: root
+    mode: "0644"
+  when: not common_cups_files_conf_orig_exists.stat.exists
   tags:
     - cups-server
     - cups-client
@@ -143,10 +159,9 @@
     dest: /etc/cups/cups-files.conf
     owner: root
     group: root
-    mode: 0644
+    mode: "0644"
   notify:
-     Restart cups
+    - Restart cups
   tags:
     - cups-server
     - cups-client
-