diff options
| -rw-r--r-- | inventory/host_vars/s2-calypso.yml | 8 | ||||
| -rw-r--r-- | inventory/host_vars/s2-dione.yml | 34 | ||||
| -rw-r--r-- | inventory/host_vars/s2-helene.yml | 34 | ||||
| -rw-r--r-- | inventory/host_vars/s2-telesto.yml | 10 | ||||
| -rw-r--r-- | inventory/hosts.ini | 4 | ||||
| -rw-r--r-- | roles/elevate/media/tasks/main.yml | 10 | ||||
| -rw-r--r-- | roles/ws/base/tasks/main.yml | 16 | ||||
| -rw-r--r-- | spreadspace/s2-calypso.yml | 12 | ||||
| -rw-r--r-- | spreadspace/s2-dione.yml | 12 | ||||
| -rw-r--r-- | spreadspace/s2-helene.yml | 12 | ||||
| -rw-r--r-- | spreadspace/s2-telesto.yml | 12 |
11 files changed, 22 insertions, 142 deletions
diff --git a/inventory/host_vars/s2-calypso.yml b/inventory/host_vars/s2-calypso.yml deleted file mode 100644 index c9512432..00000000 --- a/inventory/host_vars/s2-calypso.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -base_packages_extra_host: - - exfat-fuse - - exfat-utils - - vlan - -admin_users_host: - - equinox diff --git a/inventory/host_vars/s2-dione.yml b/inventory/host_vars/s2-dione.yml deleted file mode 100644 index aed070dc..00000000 --- a/inventory/host_vars/s2-dione.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -install_interface: eno1 -install_dhcp: true - -install: - efi: true - disks: - primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NY0HC29501 - -network: - domain: spreadspace.org - - -base_packages_extra_host: - - exfat-fuse - - exfat-utils - - vlan - -admin_users_host: - - equinox - -docker_storage: - type: lvm - vg: "{{ host_name }}" - lv: docker - size: 15G - fs: ext4 - -kubelet_storage: - type: lvm - vg: "{{ host_name }}" - lv: kubelet - size: 10G - fs: ext4 diff --git a/inventory/host_vars/s2-helene.yml b/inventory/host_vars/s2-helene.yml deleted file mode 100644 index cbef7df3..00000000 --- a/inventory/host_vars/s2-helene.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -install_interface: eno1 -install_dhcp: true - -install: - efi: true - disks: - primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NB0J803346 - -network: - domain: spreadspace.org - - -base_packages_extra_host: - - exfat-fuse - - exfat-utils - - vlan - -admin_users_host: - - equinox - -docker_storage: - type: lvm - vg: "{{ host_name }}" - lv: docker - size: 15G - fs: ext4 - -kubelet_storage: - type: lvm - vg: "{{ host_name }}" - lv: kubelet - size: 10G - fs: ext4 diff --git a/inventory/host_vars/s2-telesto.yml b/inventory/host_vars/s2-telesto.yml deleted file mode 100644 index 20c3d55a..00000000 --- a/inventory/host_vars/s2-telesto.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" - -base_packages_extra_host: - - exfat-fuse - - exfat-utils - - vlan - -admin_users_host: - - equinox diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 1ac1d45a..d1143a7d 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -121,11 +121,7 @@ env_group=spreadspace [spreadspace] s2-build host_name=build s2-mr-snuggles host_name=mr-snuggles -s2-calypso host_name=calypso -s2-telesto host_name=telesto s2-thetys host_name=thetys -s2-dione host_name=dione -s2-helene host_name=helene [schlagergarten-gloria:vars] diff --git a/roles/elevate/media/tasks/main.yml b/roles/elevate/media/tasks/main.yml index 9de552c1..87815bbc 100644 --- a/roles/elevate/media/tasks/main.yml +++ b/roles/elevate/media/tasks/main.yml @@ -5,13 +5,21 @@ - name: install and configure nextcloud import_tasks: nextcloud.yml -- name: install exfat +- name: install exfat packages for legacy installs + when: (ansible_distribution == 'Debian' and (ansible_distribution_major_version | int) < 11) or (ansible_distribution == 'Ubuntu' and (ansible_distribution_major_version | int) < 22) apt: name: - exfat-fuse - exfat-utils state: present +- name: install exfat packages for new installs + when: (ansible_distribution == 'Debian' and (ansible_distribution_major_version | int) >= 11) or (ansible_distribution == 'Ubuntu' and (ansible_distribution_major_version | int) >= 22) + apt: + name: + - exfatprogs + state: present + - name: install dstat script template: src: dstat.sh.j2 diff --git a/roles/ws/base/tasks/main.yml b/roles/ws/base/tasks/main.yml index 8a1e8bd5..5b179887 100644 --- a/roles/ws/base/tasks/main.yml +++ b/roles/ws/base/tasks/main.yml @@ -36,19 +36,29 @@ name: - pwgen - p7zip-rar - - exfat-fuse - - exfat-utils - ntfs-3g -# - gnupg-curl - pass - evince - geeqie - file-roller - cifs-utils + state: present + +- name: install exfat packages for legacy installs + when: (ansible_distribution == 'Debian' and (ansible_distribution_major_version | int) < 11) or (ansible_distribution == 'Ubuntu' and (ansible_distribution_major_version | int) < 22) + apt: + name: - exfat-fuse - exfat-utils state: present +- name: install exfat packages for new installs + when: (ansible_distribution == 'Debian' and (ansible_distribution_major_version | int) >= 11) or (ansible_distribution == 'Ubuntu' and (ansible_distribution_major_version | int) >= 22) + apt: + name: + - exfatprogs + state: present + - name: install browser apt: name: diff --git a/spreadspace/s2-calypso.yml b/spreadspace/s2-calypso.yml deleted file mode 100644 index 126f13b0..00000000 --- a/spreadspace/s2-calypso.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Basic Setup - hosts: s2-calypso - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/cpu-microcode - - role: core/admin-users - - role: apt-repo/spreadspace - - role: streaming/blackmagic/desktopvideo diff --git a/spreadspace/s2-dione.yml b/spreadspace/s2-dione.yml deleted file mode 100644 index dfe85b98..00000000 --- a/spreadspace/s2-dione.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Basic Setup - hosts: s2-dione - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/cpu-microcode - - role: core/admin-users - - role: apt-repo/spreadspace - - role: streaming/blackmagic/desktopvideo diff --git a/spreadspace/s2-helene.yml b/spreadspace/s2-helene.yml deleted file mode 100644 index e118db1f..00000000 --- a/spreadspace/s2-helene.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Basic Setup - hosts: s2-helene - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/cpu-microcode - - role: core/admin-users - - role: apt-repo/spreadspace - - role: streaming/blackmagic/desktopvideo diff --git a/spreadspace/s2-telesto.yml b/spreadspace/s2-telesto.yml deleted file mode 100644 index 91a948d8..00000000 --- a/spreadspace/s2-telesto.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Basic Setup - hosts: s2-telesto - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/cpu-microcode - - role: core/admin-users - - role: streaming/blackmagic/desktopvideo - - role: apt-repo/spreadspace |