From 82dca4a02cb623658064fb032664a511866c30dd Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Fri, 29 Jan 2021 21:08:21 +0100
Subject: [PATCH] update..

---
 group_vars/all/main.yml     |  5 +++++
 roles/common/tasks/apt.yml  | 22 ++++++++++++++++++++++
 roles/common/tasks/main.yml | 12 ++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index a4a95aa..e471084 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -571,6 +571,11 @@ apt_remove:
   - tor
   - tor-geoipdb
   - torsocks
+
+apt_remove_xenial:
+  - netplan.io
+
+apt_remove_bionic:
   - netplan.io
 
 apt_remove_purge: false
diff --git a/roles/common/tasks/apt.yml b/roles/common/tasks/apt.yml
index d774700..19190a9 100644
--- a/roles/common/tasks/apt.yml
+++ b/roles/common/tasks/apt.yml
@@ -262,6 +262,28 @@
   tags:
     - apt-remove
 
+- name: (apt.yml) Remove unwanted packages Ubuntu bionic
+  apt:
+    name: "{{ apt_remove_bionic }}"
+    state: absent
+    purge: "{{ apt_remove_purge }}"
+  when:
+    - ansible_facts['distribution'] == "Ubuntu"
+    - ansible_facts['distribution_release'] == "bionic"
+  tags:
+    - apt-remove
+
+- name: (apt.yml) Remove unwanted packages Ubuntu xenial
+  apt:
+    name: "{{ apt_remove_xenial }}"
+    state: absent
+    purge: "{{ apt_remove_purge }}"
+  when:
+    - ansible_facts['distribution'] == "Ubuntu"
+    - ansible_facts['distribution_release'] == "xenial"
+  tags:
+    - apt-remove
+
 - name: (apt.yml) autoremove
   apt:
     autoremove: true
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 1be8bee..a05e75f 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -227,6 +227,18 @@
     - 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)"