diff options
author | Christian Pointner <equinox@spreadspace.org> | 2020-12-20 22:17:26 +0100 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2020-12-20 22:17:26 +0100 |
commit | 39dedfe408dc37bbc69e31cfc512a1c6d0327a25 (patch) | |
tree | 55ad00c35c01bb7b316bd3783443cd6ba102cbc0 | |
parent | add host ch-epimetheus (diff) |
ws/base: make superflous package list configurable
-rw-r--r-- | inventory/host_vars/ch-equinox-ws.yml | 2 | ||||
-rw-r--r-- | roles/ws/base/defaults/main.yml | 24 | ||||
-rw-r--r-- | roles/ws/base/tasks/main.yml | 15 |
3 files changed, 23 insertions, 18 deletions
diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml index e1a17962..499d0254 100644 --- a/inventory/host_vars/ch-equinox-ws.yml +++ b/inventory/host_vars/ch-equinox-ws.yml @@ -43,6 +43,8 @@ network: gateway: "{{ network_zones.lan.gateway }}" interfaces: - *_network_primary_ + - name: enp4s0 + address: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" base_modules_blacklist: "{{ base_modules_blacklist_none }}" 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 |