From 7790ee82a15a6546a7a643dc7674ba2e97c025ad Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 22 Feb 2024 15:53:23 +0100 Subject: add ele-chromebook --- _graveyard_/dan/ele-laptop.yml | 16 +++++++ _graveyard_/inventory/host_vars/ele-laptop.yml | 61 ++++++++++++++++++++++++++ _graveyard_/inventory/hosts.ini | 1 + dan/ele-chromebook.yml | 16 +++++++ dan/ele-laptop.yml | 16 ------- inventory/group_vars/elevate-festival/vars.yml | 6 +-- inventory/host_vars/ele-chromebook.yml | 60 +++++++++++++++++++++++++ inventory/host_vars/ele-laptop.yml | 61 -------------------------- inventory/hosts.ini | 2 +- roles/ws/pipewire/tasks/main.yml | 2 +- 10 files changed, 159 insertions(+), 82 deletions(-) create mode 100644 _graveyard_/dan/ele-laptop.yml create mode 100644 _graveyard_/inventory/host_vars/ele-laptop.yml create mode 100644 dan/ele-chromebook.yml delete mode 100644 dan/ele-laptop.yml create mode 100644 inventory/host_vars/ele-chromebook.yml delete mode 100644 inventory/host_vars/ele-laptop.yml diff --git a/_graveyard_/dan/ele-laptop.yml b/_graveyard_/dan/ele-laptop.yml new file mode 100644 index 00000000..58b9d9f5 --- /dev/null +++ b/_graveyard_/dan/ele-laptop.yml @@ -0,0 +1,16 @@ +--- +- name: Basic Setup + hosts: ele-laptop + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd/base + - role: core/zsh + - role: core/ntp + - role: core/cpu-microcode + +- name: Payload Setup + hosts: ele-laptop + roles: + - role: ws/base + - role: core/admin-users diff --git a/_graveyard_/inventory/host_vars/ele-laptop.yml b/_graveyard_/inventory/host_vars/ele-laptop.yml new file mode 100644 index 00000000..add2ff94 --- /dev/null +++ b/_graveyard_/inventory/host_vars/ele-laptop.yml @@ -0,0 +1,61 @@ +--- +debian_preseed_language: de +debian_preseed_country: AT +debian_preseed_locales: + - de_AT.UTF-8 + - de_DE.UTF-8 + - en_US.UTF-8 + +debian_preseed_no_splash: no +debian_preseed_install_tasks: + - xubuntu-desktop + +install: + efi: yes + disks: + primary: /dev/disk/by-id/ata-Samsung_SSD_850_EVO_120GB_S21UNX0H608482L + system_lvm: + volumes: + - name: root + size: 20G + filesystem: ext4 + mountpoint: / + - name: var+log + size: 768M + filesystem: ext4 + mountpoint: /var/log + mount_options: + - noatime + - nodev + - noexec + - name: home + size: 80G + filesystem: ext4 + mountpoint: /home + kernel_cmdline: + - "pci=noaer" + +network: + nameservers: "{{ network_zones.lan.dns }}" + domain: "{{ host_domain }}" + primary: &_network_primary_ + name: enp2s0 + address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.lan.gateway }}" + interfaces: + - *_network_primary_ + + +apt_repo_components: + - main + - restricted + - universe + - multiverse + + +base_modules_blacklist: "{{ base_modules_blacklist_none }}" + +admin_users_host: + - equinox + +ws_base_superflous_packages: [] diff --git a/_graveyard_/inventory/hosts.ini b/_graveyard_/inventory/hosts.ini index 9af30e82..fedd2dc0 100644 --- a/_graveyard_/inventory/hosts.ini +++ b/_graveyard_/inventory/hosts.ini @@ -63,6 +63,7 @@ ele-dol-translator [elevate:children] ele-dolmetsch-ctl +ele-laptop host_name=elevatop ############################### diff --git a/dan/ele-chromebook.yml b/dan/ele-chromebook.yml new file mode 100644 index 00000000..414b2cc5 --- /dev/null +++ b/dan/ele-chromebook.yml @@ -0,0 +1,16 @@ +--- +- name: Basic Setup + hosts: ele-chromebook + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd/base + - role: core/zsh + - role: core/cpu-microcode + +- name: Payload Setup + hosts: ele-chromebook + roles: + - role: ws/base + - role: core/admin-users + - role: ws/flatpak diff --git a/dan/ele-laptop.yml b/dan/ele-laptop.yml deleted file mode 100644 index 58b9d9f5..00000000 --- a/dan/ele-laptop.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- name: Basic Setup - hosts: ele-laptop - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/ntp - - role: core/cpu-microcode - -- name: Payload Setup - hosts: ele-laptop - roles: - - role: ws/base - - role: core/admin-users diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml index ee2e58cf..a20b899b 100644 --- a/inventory/group_vars/elevate-festival/vars.yml +++ b/inventory/group_vars/elevate-festival/vars.yml @@ -30,7 +30,7 @@ network_zones: tricaster: 245 datacop: 249 equinox-t450s: 250 - ele-laptop: 251 + ele-chromebook: 251 ele-testvm: 253 ele-router: 254 wifi: @@ -61,7 +61,7 @@ network_zones: ele-hpws-mini1: 212 ele-hpws-mini2: 213 equinox-t450s: 250 - ele-laptop: 251 + ele-chromebook: 251 jampo: 252 ele-router: 254 @@ -259,7 +259,7 @@ network_zones: ## citycom uses offset 1,2 and 3 ele-telesto: 4 # 85.237.28.196 ele-dione: 5 # 85.237.28.197 - ele-laptop: 7 # 85.237.28.199 + ele-chromebook: 7 # 85.237.28.199 cc_dom: description: "citycom upstream @ Dom im Berg (Fiber)" diff --git a/inventory/host_vars/ele-chromebook.yml b/inventory/host_vars/ele-chromebook.yml new file mode 100644 index 00000000..6d0cc813 --- /dev/null +++ b/inventory/host_vars/ele-chromebook.yml @@ -0,0 +1,60 @@ +--- +ubuntu_autoinstall_locale: de_AT +ubuntu_autoinstall_keyboard_layout: de +ubuntu_autoinstall_keyboard_variant: nodeadkeys +ubuntu_autoinstall_timezone: Europe/Vienna + +ubuntu_autoinstall_desktop: xubuntu + +install: + efi: yes + disks: + primary: /dev/disk/by-id/nvme-KBG40ZMT128G_TOSHIBA_MEMORY_X0CPG4JGQA71 + system_lvm: + volumes: + - name: root + size: 20G + filesystem: ext4 + mountpoint: / + - name: var+log + size: 768M + filesystem: ext4 + mountpoint: /var/log + mount_options: + - noatime + - nodev + - noexec + - name: home + size: 50G + filesystem: ext4 + mountpoint: /home + kernel_cmdline: + - quiet + - splash + - iommu=pt + +network: + nameservers: "{{ network_zones.lan.dns }}" + domain: "{{ host_domain }}" + primary: &_network_primary_ + name: enx00e04d6a076e + address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.lan.gateway }}" + interfaces: + - *_network_primary_ + +base_modules_blacklist: "{{ base_modules_blacklist_none }}" + +admin_users_host: + - equinox + +apt_repo_components: + - main + - restricted + - universe + - multiverse + + +ws_flatpak_apps: + - name: org.pipewire.Helvum + link: helvum diff --git a/inventory/host_vars/ele-laptop.yml b/inventory/host_vars/ele-laptop.yml deleted file mode 100644 index add2ff94..00000000 --- a/inventory/host_vars/ele-laptop.yml +++ /dev/null @@ -1,61 +0,0 @@ ---- -debian_preseed_language: de -debian_preseed_country: AT -debian_preseed_locales: - - de_AT.UTF-8 - - de_DE.UTF-8 - - en_US.UTF-8 - -debian_preseed_no_splash: no -debian_preseed_install_tasks: - - xubuntu-desktop - -install: - efi: yes - disks: - primary: /dev/disk/by-id/ata-Samsung_SSD_850_EVO_120GB_S21UNX0H608482L - system_lvm: - volumes: - - name: root - size: 20G - filesystem: ext4 - mountpoint: / - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec - - name: home - size: 80G - filesystem: ext4 - mountpoint: /home - kernel_cmdline: - - "pci=noaer" - -network: - nameservers: "{{ network_zones.lan.dns }}" - domain: "{{ host_domain }}" - primary: &_network_primary_ - name: enp2s0 - address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" - gateway: "{{ network_zones.lan.gateway }}" - interfaces: - - *_network_primary_ - - -apt_repo_components: - - main - - restricted - - universe - - multiverse - - -base_modules_blacklist: "{{ base_modules_blacklist_none }}" - -admin_users_host: - - equinox - -ws_base_superflous_packages: [] diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 7fd2fbb4..14441fb1 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -231,7 +231,7 @@ ele-hpws-mini2 host_name=hpws-mini2 ele-minidan host_name=minidan ele-uhrturm host_name=uhrturm ele-lt host_name=liquidtruth -ele-laptop host_name=elevatop +ele-chromebook host_name=chromebook ele-orpheum ele-tub ele-gwhetzner diff --git a/roles/ws/pipewire/tasks/main.yml b/roles/ws/pipewire/tasks/main.yml index 2454bd05..3f99b60c 100644 --- a/roles/ws/pipewire/tasks/main.yml +++ b/roles/ws/pipewire/tasks/main.yml @@ -42,7 +42,7 @@ src: /usr/share/doc/pipewire/examples/alsa.conf.d/99-pipewire-default.conf dest: /etc/alsa/conf.d/99-pipewire-default.conf -- name: remove pulseadio for als default device +- name: remove pulseadio for alsa default device loop: - 99-pulseaudio-default.conf.example - 99-pulse.conf -- cgit v1.2.3