From dae762e43fcb931deb7a7214a6ed7d932a93de7a Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Wed, 27 Jan 2021 19:28:43 +0100
Subject: [PATCH] update..

---
 hosts                                         |  4 ++
 roles/common/tasks/main.yml                   | 11 +++++
 .../common/tasks/ubuntu-x11vnc-1604-amd64.yml | 12 +----
 .../common/tasks/ubuntu-x11vnc-1804-amd64.yml | 20 +++-----
 .../common/tasks/ubuntu-x11vnc-2004-amd64.yml | 49 +++++++++++++++++++
 .../templates/root/bin/wakeup_lan.sh.j2       |  1 +
 6 files changed, 74 insertions(+), 23 deletions(-)
 create mode 100644 roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml

diff --git a/hosts b/hosts
index e3079cd..cffa15f 100644
--- a/hosts
+++ b/hosts
@@ -7,6 +7,7 @@ ab5.akb.netz
 ab7.akb.netz
 ab8.akb.netz
 ab9.akb.netz
+ab11.akb.netz
 file-akb.akb.netz ansible_user=root
 192.168.82.20 ansible_user=root
 
@@ -18,6 +19,7 @@ ab5.akb.netz
 ab7.akb.netz
 ab8.akb.netz
 ab9.akb.netz
+ab11.akb.netz
 
 [nfs_client]
 ab1.akb.netz
@@ -27,6 +29,7 @@ ab5.akb.netz
 ab7.akb.netz
 ab8.akb.netz
 ab9.akb.netz
+ab11.akb.netz
 
 [nis_client]
 ab1.akb.netz
@@ -36,6 +39,7 @@ ab5.akb.netz
 ab7.akb.netz
 ab8.akb.netz
 ab9.akb.netz
+ab11.akb.netz
 
 [file_server]
 file-akb.akb.netz ansible_user=root
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 55cb505..e7a0f1b 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -228,6 +228,17 @@
     - finish-client-install
 
 
+- name: "For OS: Ubuntu 20.04LTS, Arch: amd64"
+  import_tasks: ubuntu-x11vnc-2004-amd64.yml
+  when:
+    - ansible_distribution_version ==  "20.04"
+    - ansible_architecture == "x86_64"
+  tags:
+    - x11vnc
+    - x11vnc-2004
+    - finish-client-install
+
+
 #- name: "Configure LUKS"
 #  import_tasks: luks.yml
 #  when: "groups['client_pc']|string is search(inventory_hostname)"
diff --git a/roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml
index 34ee9b5..a4ebc16 100644
--- a/roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml
+++ b/roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml
@@ -1,4 +1,5 @@
-  # Title: app-x11vnc-server
+---
+# Title: app-x11vnc-server
   #
   # Author: Luc Rutten
   # Version: 1.0
@@ -22,15 +23,6 @@
       state: present
     when: x11vnc_active.stat.exists == False
 
-  - name: "(ubuntu-x11vnc-1804-amd64.yml) Install packages"
-    apt:
-      name: "{{ packages }}"
-      update_cache: yes
-      state: present
-    vars:
-      packages:
-      - x11vnc
-
   - name: "(ubuntu-x11vnc-1604-amd64.yml) Store password"
     shell: "x11vnc -storepasswd {{ vnc_password }} /etc/x11vnc.pass"
 
diff --git a/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml
index 7c803be..f357504 100644
--- a/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml
+++ b/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml
@@ -11,7 +11,7 @@
   # Source:
   #   - http://c-nergy.be/blog/?p=8984
 
-  - name: "(ubuntu-x11vnc-1804-amd64.yml) Install packages"
+  - name: "(ubuntu-x11vnc-2005-amd64.yml) Install packages"
     apt:
       name: "{{ packages }}"
       update_cache: yes
@@ -20,29 +20,23 @@
       packages:
       - x11vnc
 
-  - name: "(ubuntu-x11vnc-1804-amd64.yml) Store password"
+  - name: "(ubuntu-x11vnc-2005-amd64.yml) Store password"
     raw: "x11vnc -storepasswd {{ vnc_password }} /etc/x11vnc.pass"
 
-  - name: "(ubuntu-x11vnc-1804-amd64.yml) Set permissions on /etc/x11vnc.pass"
+  - name: "(ubuntu-x11vnc-2005-amd64.yml) Set permissions on /etc/x11vnc.pass"
     file:
      path: "/etc/x11vnc.pass"
      mode: 0644
 
-  - name: "(ubuntu-x11vnc-1804-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service"
+  - name: "(ubuntu-x11vnc-2005-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service"
     template:
       src: lib/systemd/system/x11vnc.service.j2
       dest: /lib/systemd/system/x11vnc.service
 
-  - name: "(ubuntu-x11vnc-1804-amd64.yml) Enable service"
+  - name: "(ubuntu-x11vnc-2005-amd64.yml) Enable service"
     systemd:
       name: x11vnc.service
-      enabled: true
+      daemon_reload: yes
+      enabled: yes
       state: restarted
 
-  - name: "(ubuntu-x11vnc-1804-amd64.yml) Remove whisker menu entry for allusers (except owner and group)"
-    file:
-      path: "/usr/share/applications/x11vnc.desktop"
-      mode: 0750
-      owner: root
-      group: root
-
diff --git a/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml
new file mode 100644
index 0000000..c74859c
--- /dev/null
+++ b/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml
@@ -0,0 +1,49 @@
+---
+  # Title: app-x11vnc-server
+  #
+  # Author: Luc Rutten
+  # Version: 1.0
+  # File: tasks/main.yml
+  #
+  # Description:
+  #   Remote support
+  #
+  # Source:
+  #   - http://c-nergy.be/blog/?p=8984
+
+  - name: "(ubuntu-x11vnc-1804-amd64.yml) Install packages"
+    apt:
+      name: "{{ packages }}"
+      update_cache: yes
+      state: present
+    vars:
+      packages:
+      - x11vnc
+
+  - name: "(ubuntu-x11vnc-1804-amd64.yml) Store password"
+    raw: "x11vnc -storepasswd {{ vnc_password }} /etc/x11vnc.pass"
+
+  - name: "(ubuntu-x11vnc-1804-amd64.yml) Set permissions on /etc/x11vnc.pass"
+    file:
+     path: "/etc/x11vnc.pass"
+     mode: 0644
+
+  - name: "(ubuntu-x11vnc-1804-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service"
+    template:
+      src: lib/systemd/system/x11vnc.service.j2
+      dest: /lib/systemd/system/x11vnc.service
+
+  - name: "(ubuntu-x11vnc-1804-amd64.yml) Enable service"
+    systemd:
+      name: x11vnc.service
+      daemon_reload: yes
+      enabled: yes
+      state: restarted
+
+#  - name: "(ubuntu-x11vnc-1804-amd64.yml) Remove whisker menu entry for allusers (except owner and group)"
+#    file:
+#      path: "/usr/share/applications/x11vnc.desktop"
+#      mode: 0750
+#      owner: root
+#      group: root
+
diff --git a/roles/common/templates/root/bin/wakeup_lan.sh.j2 b/roles/common/templates/root/bin/wakeup_lan.sh.j2
index 29f3a33..fcc9b6d 100755
--- a/roles/common/templates/root/bin/wakeup_lan.sh.j2
+++ b/roles/common/templates/root/bin/wakeup_lan.sh.j2
@@ -16,6 +16,7 @@ ab7="80:ee:73:c5:2e:fb 80:ee:73:c5:2e:fc"
 ab8="80:ee:73:d0:a5:71 80:ee:73:d0:a5:72"
 ab9="80:ee:73:e0:0e:8a 80:ee:73:e0:0e:8b"
 ab10="00:d8:61:c9:c8:3d"
+ab11="a8:a1:59:44:73:f8"
 
 if [ $# = "1" ]; then
    echo ""