From 46ca6dd017e513338366d88b9aba04aafaf5a8fd Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 11 Nov 2020 01:05:08 +0100 Subject: rename ubuntu-ws role to ws/base --- chaos-at-home/ch-equinox-ws.yml | 2 +- dan/ele-telesto.yml | 2 +- roles/ubuntu-ws/defaults/main.yml | 2 - roles/ubuntu-ws/tasks/main.yml | 82 ------------------------- roles/ubuntu-ws/templates/prohibited-package.j2 | 3 - roles/ws/base/defaults/main.yml | 2 + roles/ws/base/tasks/main.yml | 82 +++++++++++++++++++++++++ roles/ws/base/templates/prohibited-package.j2 | 3 + spreadspace/lw-telesto.yml | 2 +- 9 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 roles/ubuntu-ws/defaults/main.yml delete mode 100644 roles/ubuntu-ws/tasks/main.yml delete mode 100644 roles/ubuntu-ws/templates/prohibited-package.j2 create mode 100644 roles/ws/base/defaults/main.yml create mode 100644 roles/ws/base/tasks/main.yml create mode 100644 roles/ws/base/templates/prohibited-package.j2 diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml index 981e65fb..f7c77328 100644 --- a/chaos-at-home/ch-equinox-ws.yml +++ b/chaos-at-home/ch-equinox-ws.yml @@ -13,4 +13,4 @@ - role: apt-repo/tor-project - role: apt-repo/kubernetes - role: apt-repo/riot - - role: ubuntu-ws + - role: ws/base diff --git a/dan/ele-telesto.yml b/dan/ele-telesto.yml index 0e0470b2..11f21ef0 100644 --- a/dan/ele-telesto.yml +++ b/dan/ele-telesto.yml @@ -10,4 +10,4 @@ - role: core/admin-users - role: streaming/blackmagic/desktopvideo - role: apt-repo/spreadspace - - role: ubuntu-ws + - role: ws/base diff --git a/roles/ubuntu-ws/defaults/main.yml b/roles/ubuntu-ws/defaults/main.yml deleted file mode 100644 index 9db0c3dc..00000000 --- a/roles/ubuntu-ws/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -ubuntu_ws_extra_packages: [] diff --git a/roles/ubuntu-ws/tasks/main.yml b/roles/ubuntu-ws/tasks/main.yml deleted file mode 100644 index 9e3b55b8..00000000 --- a/roles/ubuntu-ws/tasks/main.yml +++ /dev/null @@ -1,82 +0,0 @@ ---- -- name: prohibited packages - loop: - - flashplugin-installer - template: - src: prohibited-package.j2 - dest: "/etc/apt/preferences.d/{{ item }}.disabled" - -- name: base packages - apt: - name: - - file - - pwgen - - p7zip-rar - - exfat-fuse - - exfat-utils - - ntfs-3g -# - gnupg-curl - - pass - - evince - - geeqie - - file-roller - - cifs-utils - - exfat-fuse - - exfat-utils - state: present - -- name: install browser - apt: - name: - - firefox - - chromium-browser - state: present - -- name: install multimedia stuff - apt: - name: - - vlc - - mpv - - ffmpeg - - pavumeter - - lame - - gstreamer1.0-pulseaudio - state: present - -- name: install restricted stuff - apt: - name: - - ubuntu-restricted-extras - - chromium-codecs-ffmpeg-extra - - intel-microcode - - amd64-microcode - state: present - -- 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 - state: absent - autoremove: yes - purge: yes - -- name: remove netplan config for network-manager - file: - name: /etc/netplan/01-network-manager-all.yaml - state: absent - -- name: install extra packages - apt: - name: "{{ ubuntu_ws_extra_packages }}" - state: present diff --git a/roles/ubuntu-ws/templates/prohibited-package.j2 b/roles/ubuntu-ws/templates/prohibited-package.j2 deleted file mode 100644 index c5ef1062..00000000 --- a/roles/ubuntu-ws/templates/prohibited-package.j2 +++ /dev/null @@ -1,3 +0,0 @@ -Package: {{ item }} -Pin: release * -Pin-Priority: -1 diff --git a/roles/ws/base/defaults/main.yml b/roles/ws/base/defaults/main.yml new file mode 100644 index 00000000..9db0c3dc --- /dev/null +++ b/roles/ws/base/defaults/main.yml @@ -0,0 +1,2 @@ +--- +ubuntu_ws_extra_packages: [] diff --git a/roles/ws/base/tasks/main.yml b/roles/ws/base/tasks/main.yml new file mode 100644 index 00000000..9e3b55b8 --- /dev/null +++ b/roles/ws/base/tasks/main.yml @@ -0,0 +1,82 @@ +--- +- name: prohibited packages + loop: + - flashplugin-installer + template: + src: prohibited-package.j2 + dest: "/etc/apt/preferences.d/{{ item }}.disabled" + +- name: base packages + apt: + name: + - file + - pwgen + - p7zip-rar + - exfat-fuse + - exfat-utils + - ntfs-3g +# - gnupg-curl + - pass + - evince + - geeqie + - file-roller + - cifs-utils + - exfat-fuse + - exfat-utils + state: present + +- name: install browser + apt: + name: + - firefox + - chromium-browser + state: present + +- name: install multimedia stuff + apt: + name: + - vlc + - mpv + - ffmpeg + - pavumeter + - lame + - gstreamer1.0-pulseaudio + state: present + +- name: install restricted stuff + apt: + name: + - ubuntu-restricted-extras + - chromium-codecs-ffmpeg-extra + - intel-microcode + - amd64-microcode + state: present + +- 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 + state: absent + autoremove: yes + purge: yes + +- name: remove netplan config for network-manager + file: + name: /etc/netplan/01-network-manager-all.yaml + state: absent + +- name: install extra packages + apt: + name: "{{ ubuntu_ws_extra_packages }}" + state: present diff --git a/roles/ws/base/templates/prohibited-package.j2 b/roles/ws/base/templates/prohibited-package.j2 new file mode 100644 index 00000000..c5ef1062 --- /dev/null +++ b/roles/ws/base/templates/prohibited-package.j2 @@ -0,0 +1,3 @@ +Package: {{ item }} +Pin: release * +Pin-Priority: -1 diff --git a/spreadspace/lw-telesto.yml b/spreadspace/lw-telesto.yml index 2f2794ad..61f33fe6 100644 --- a/spreadspace/lw-telesto.yml +++ b/spreadspace/lw-telesto.yml @@ -10,5 +10,5 @@ - role: core/admin-users - role: streaming/blackmagic/desktopvideo - role: apt-repo/spreadspace - - role: ubuntu-ws + - role: ws/base - role: wireguard/base -- cgit v1.2.3