From 39dedfe408dc37bbc69e31cfc512a1c6d0327a25 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 20 Dec 2020 22:17:26 +0100
Subject: ws/base: make superflous package list configurable

---
 roles/ws/base/defaults/main.yml | 24 +++++++++++++++++++-----
 roles/ws/base/tasks/main.yml    | 15 ++-------------
 2 files changed, 21 insertions(+), 18 deletions(-)

(limited to 'roles/ws')

diff --git a/roles/ws/base/defaults/main.yml b/roles/ws/base/defaults/main.yml
index af028ab9..d176eb8a 100644
--- a/roles/ws/base/defaults/main.yml
+++ b/roles/ws/base/defaults/main.yml
@@ -1,12 +1,26 @@
 ---
-ws_base_extra_packages: []
-
 # ws_base_home_zfs: {}
 
+# ws_base_hide_ntfs_disks:
+#  - /dev/disk/by-id/ata-blub_foo-part1
+
+ws_base_superflous_packages:
+  - gnome-keyring
+  - gnome-software
+  - gnome-software-common
+  - software-properties-gtk
+  - software-properties-common
+  - "{{ python_basename }}-software-properties"
+  - flashplugin-installer
+  - network-manager
+  - network-manager-gnome
+  - network-manager-pptp
+  - network-manager-pptp-gnome
+  - ufw
+
+ws_base_extra_packages: []
+
 # ws_base_xrandr_setup_script: |
 #   #!/bin/bash
 #   xrandr --output HDMI-1 --mode 1920x1080 --primary
 #   exit 0
-
-# ws_base_hide_ntfs_disks:
-#  - /dev/disk/by-id/ata-blub_foo-part1
diff --git a/roles/ws/base/tasks/main.yml b/roles/ws/base/tasks/main.yml
index bf30fc04..a5ae47c6 100644
--- a/roles/ws/base/tasks/main.yml
+++ b/roles/ws/base/tasks/main.yml
@@ -59,24 +59,13 @@
 
 - name: remove superflous packages
   apt:
-    name:
-    - gnome-keyring
-    - gnome-software
-    - gnome-software-common
-    - software-properties-gtk
-    - software-properties-common
-    - "{{ python_basename }}-software-properties"
-    - flashplugin-installer
-    - network-manager
-    - network-manager-gnome
-    - network-manager-pptp
-    - network-manager-pptp-gnome
-    - ufw
+    name: "{{ ws_base_superflous_packages }}"
     state: absent
     autoremove: yes
     purge: yes
 
 - name: remove netplan config for network-manager
+  when: "'network-manager' in ws_base_superflous_packages"
   file:
     name: /etc/netplan/01-network-manager-all.yaml
     state: absent
-- 
cgit v1.2.3