update..

roles/common/tasks/main.yml

@@ -139,14 +139,6 @@
     - nis-samba-user
 
 
-# tags supported inside mount_samba_shares.yml:
-#
-#- import_tasks: mount_samba_shares.yml
-#  when: "groups['client_pc']|string is search(inventory_hostname)"
-#  tags:
-#    - samba-shares
-
-
 # tags supported system-user-systemfiles.yml:
 #
 #    profile
@@ -200,6 +192,14 @@
     - sudoers
 
 
+# tags supported inside mount_samba_shares.yml:
+#
+#- import_tasks: mount_samba_shares.yml
+#  when: "groups['client_pc']|string is search(inventory_hostname)"
+#  tags:
+#    - samba-shares
+
+
 # Tasks: Configure VNC (x11vnc) for Ubuntu systems
 #
 # Supported OS:

roles/common/tasks/nis-install-client.yml

@@ -179,7 +179,7 @@
 - name: (nis-install-client.yml) Adjust file /etc/nsswitch.conf (set hosts)
   replace:
     path: /etc/nsswitch.conf
-    regexp: '(hosts:\s+files)\s+([^nis].*)'
+    regexp: '(hosts:\s+files)\s+((?!nis).*)$'
     replace: '\1 nis \2'
   tags:
     - nis-install
@@ -188,7 +188,7 @@
 - name: (nis-install-client.yml) Adjust file /etc/nsswitch.conf (set passwd/group/shadow)
   replace:
     path: /etc/nsswitch.conf
-    regexp: '^({{ item }}:\s+.*)'
+    regexp: '^({{ item }}:\s+((?!nis).)*)$'
     replace: '\1 nis'
   with_items:
      - passwd

roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml

@@ -24,6 +24,21 @@
     shell: echo "$(id -u gdm)"
     register: grp_id_gdm
 
+  - name: Check if file '/etc/gdm3/custom.conf' exists
+    stat:
+      path: /etc/gdm3/custom.conf
+    register: etc_gdm_custom_conf_exists
+
+  - name: Adjust file '/etc/gdm3/custom.conf'
+    lineinfile:
+      dest: /etc/gdm3/custom.conf
+      state: present
+      regexp: '^WaylandEnable'
+      line: 'WaylandEnable=false'
+      insertafter: '^#?\s*WaylandEnable'
+    when:
+      - etc_gdm_custom_conf_exists.stat.exists
+
   - name: "(ubuntu-x11vnc-1804-amd64.yml) Store password"
     raw: "x11vnc -storepasswd {{ vnc_password }} /etc/x11vnc.pass"
 

roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml

@@ -27,10 +27,28 @@
   - name: "(ubuntu-x11vnc-2004-amd64.yml) Store password"
     raw: "x11vnc -storepasswd {{ vnc_password }} /etc/x11vnc.pass"
 
+  - name: Check if file '/etc/gdm3/custom.conf' exists
+    stat:
+      path: /etc/gdm3/custom.conf
+    register: etc_gdm_custom_conf_exists
+
+  - name: Adjust file '/etc/gdm3/custom.conf'
+    lineinfile:
+      dest: /etc/gdm3/custom.conf
+      state: present
+      regexp: '^WaylandEnable'
+      line: 'WaylandEnable=false'
+      insertafter: '^#?\s*WaylandEnable'
+    when:
+      - etc_gdm_custom_conf_exists.stat.exists
+
+
   - name: "(ubuntu-x11vnc-2004-amd64.yml) Set permissions on /etc/x11vnc.pass"
     file:
-     path: "/etc/x11vnc.pass"
-     mode: 0644
+      path: /etc/x11vnc.pass
+      owner: root
+      group: root
+      mode: 0644
 
   - name: "(ubuntu-x11vnc-2004-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service"
     template: