15 files changed, 226 insertions, 15 deletions
diff --git a/inventory/host_vars/ch-calypso.yml b/inventory/host_vars/ch-calypso.yml
new file mode 100644
index 00000000..d565c6d8
--- /dev/null
+++ b/inventory/host_vars/ch-calypso.yml
@@ -0,0 +1,22 @@
+---
+install:
+  efi: yes
+  disks:
+    primary: software-raid
+    raid:
+      level: 1
+      members:
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720805
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720811
+  system_lvm:
+    size: 20G
+
+network:
+  nameservers: "{{ network_zones.lan.dns }}"
+  domain: "{{ host_domain }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml
new file mode 100644
index 00000000..40c2864b
--- /dev/null
+++ b/inventory/host_vars/ch-dione.yml
@@ -0,0 +1,22 @@
+---
+install:
+  efi: true
+  disks:
+    primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NY0HC29501
+  kernel_cmdline:
+    - "consoleblank=0"
+    - "nomodeset"
+
+network:
+  nameservers: "{{ network_zones.lan.dns }}"
+  domain: "{{ host_domain }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
+
+
+admin_users_host:
+  - equinox
diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index e31b8299..a1130257 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -1,8 +1,18 @@
 ---
-preseed_template_name: "xubuntu-focal-desktop"
+preseed_language: de
+preseed_country: AT
+preseed_locales:
+  - de_AT.UTF-8
+  - de_DE.UTF-8
+  - en_US.UTF-8
+
+preseed_no_splash: no
+preseed_install_tasks:
+  - xubuntu-desktop
+
 
 install:
-  efi: true
+  efi: yes
   disks:
     primary: /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0MA04112K
   system_lvm:
@@ -46,7 +56,7 @@ apt_repo_components:
   - universe
   - multiverse
 
-ubuntu_ws_extra_packages:
+ws_base_extra_packages:
   - aisleriot
   - atftp
   - asciidoc
diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml
new file mode 100644
index 00000000..f35225ac
--- /dev/null
+++ b/inventory/host_vars/ch-helene.yml
@@ -0,0 +1,22 @@
+---
+install:
+  efi: true
+  disks:
+    primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NB0J803346
+  kernel_cmdline:
+    - "consoleblank=0"
+    - "nomodeset"
+
+network:
+  nameservers: "{{ network_zones.lan.dns }}"
+  domain: "{{ host_domain }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
+
+
+admin_users_host:
+  - equinox
diff --git a/inventory/host_vars/ch-telesto.yml b/inventory/host_vars/ch-telesto.yml
new file mode 100644
index 00000000..a2d94e16
--- /dev/null
+++ b/inventory/host_vars/ch-telesto.yml
@@ -0,0 +1,79 @@
+---
+preseed_language: de
+preseed_country: AT
+preseed_locales:
+  - de_AT.UTF-8
+  - de_DE.UTF-8
+  - en_US.UTF-8
+
+preseed_no_splash: no
+preseed_install_tasks:
+  - xubuntu-desktop
+
+
+install:
+  efi: yes
+  disks:
+    primary: software-raid
+    raid:
+      level: 1
+      members:
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810
+  system_lvm:
+    size: 50G
+    volumes:
+    - name: root
+      size: 20G
+      filesystem: ext4
+      mountpoint: /
+    - name: var+log
+      size: 768M
+      filesystem: ext4
+      mountpoint: /var/log
+      mount_options:
+      - noatime
+      - nodev
+      - noexec
+
+network:
+  nameservers: "{{ network_zones.lan.dns }}"
+  domain: "{{ host_domain }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
+
+
+apt_repo_components:
+  - main
+  - restricted
+  - universe
+  - multiverse
+
+base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
+
+admin_users_host:
+  - equinox
+
+zfs_arc_size:
+  min: 1GB
+  max: 2GB
+
+zfs_pools:
+  storage:
+    mountpoint: /srv/storage
+    create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808-part4 /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810-part4
+
+ws_base_home_zfs:
+  pool: storage
+  name: home
+  properties:
+    xattr: sa
+    compression: lz4
+    quota: 100G
+
+ws_base_extra_packages:
+  - obs-studio
diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml
new file mode 100644
index 00000000..1c82ae9b
--- /dev/null
+++ b/inventory/host_vars/ch-thetys.yml
@@ -0,0 +1,21 @@
+---
+install:
+  efi: true
+  disks:
+    primary: "/dev/disk/by-id/ata-TS32GMSA370_B475040161"
+  kernel_cmdline:
+    - "consoleblank=0"
+
+network:
+  nameservers: "{{ network_zones.lan.dns }}"
+  domain: "{{ host_domain }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
+
+
+admin_users_host:
+  - equinox
diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml
index ab8fca7c..d565c6d8 100644
--- a/inventory/host_vars/ele-calypso.yml
+++ b/inventory/host_vars/ele-calypso.yml
@@ -1,12 +1,15 @@
 ---
 install:
+  efi: yes
   disks:
     primary: software-raid
     raid:
       level: 1
       members:
-      - /dev/sda
-      - /dev/sdb
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720805
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720811
+  system_lvm:
+    size: 20G
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml
index 233fc9e8..1152e5cf 100644
--- a/inventory/host_vars/ele-dione.yml
+++ b/inventory/host_vars/ele-dione.yml
@@ -9,7 +9,7 @@ install:
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
-  domain: spreadspace.org
+  domain: "{{ host_domain }}"
   primary: &_network_primary_
     name: eno1
     address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
@@ -17,6 +17,7 @@ network:
   interfaces:
   - *_network_primary_
 
+
 base_packages_extra_host:
   - exfat-fuse
   - exfat-utils
diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml
index a28eccf2..a5418e56 100644
--- a/inventory/host_vars/ele-helene.yml
+++ b/inventory/host_vars/ele-helene.yml
@@ -9,7 +9,7 @@ install:
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
-  domain: spreadspace.org
+  domain: "{{ host_domain }}"
   primary: &_network_primary_
     name: eno1
     address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
@@ -17,6 +17,7 @@ network:
   interfaces:
   - *_network_primary_
 
+
 base_packages_extra_host:
   - exfat-fuse
   - exfat-utils
diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml
index 8fe1376d..6e642dee 100644
--- a/inventory/host_vars/ele-telesto.yml
+++ b/inventory/host_vars/ele-telesto.yml
@@ -1,17 +1,27 @@
 ---
-base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
+preseed_language: de
+preseed_country: AT
+preseed_locales:
+  - de_AT.UTF-8
+  - de_DE.UTF-8
+  - en_US.UTF-8
+
+preseed_no_splash: no
+preseed_install_tasks:
+  - xubuntu-desktop
 
-preseed_template_name: "xubuntu-focal-desktop"
 
 install:
+  efi: yes
   disks:
     primary: software-raid
     raid:
       level: 1
       members:
-      - /dev/sda
-      - /dev/sdb
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810
   system_lvm:
+    size: 50G
     volumes:
     - name: root
       size: 20G
@@ -36,5 +46,8 @@ network:
   interfaces:
   - *_network_primary_
 
+
+base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
+
 admin_users_host:
   - equinox
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index 69bdec2b..c193de2e 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -16,6 +16,7 @@ network:
   interfaces:
   - *_network_primary_
 
+
 admin_users_host:
   - equinox
 
diff --git a/inventory/host_vars/lw-dione.yml b/inventory/host_vars/lw-dione.yml
index 02738ee6..9b05f037 100644
--- a/inventory/host_vars/lw-dione.yml
+++ b/inventory/host_vars/lw-dione.yml
@@ -18,6 +18,7 @@ network:
   interfaces:
   - *_network_primary_
 
+
 base_packages_extra_host:
   - exfat-fuse
   - exfat-utils
diff --git a/inventory/host_vars/lw-helene.yml b/inventory/host_vars/lw-helene.yml
index e7919ac7..6b68549b 100644
--- a/inventory/host_vars/lw-helene.yml
+++ b/inventory/host_vars/lw-helene.yml
@@ -18,6 +18,7 @@ network:
   interfaces:
   - *_network_primary_
 
+
 base_packages_extra_host:
   - exfat-fuse
   - exfat-utils
diff --git a/inventory/host_vars/lw-telesto.yml b/inventory/host_vars/lw-telesto.yml
index a225d787..ce9847a9 100644
--- a/inventory/host_vars/lw-telesto.yml
+++ b/inventory/host_vars/lw-telesto.yml
@@ -1,17 +1,27 @@
 ---
-base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
+preseed_language: de
+preseed_country: AT
+preseed_locales:
+  - de_AT.UTF-8
+  - de_DE.UTF-8
+  - en_US.UTF-8
+
+preseed_no_splash: no
+preseed_install_tasks:
+  - xubuntu-desktop
 
-preseed_template_name: "xubuntu-focal-desktop"
 
 install:
+  efi: yes
   disks:
     primary: software-raid
     raid:
       level: 1
       members:
-      - /dev/sda
-      - /dev/sdb
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810
   system_lvm:
+    size: 50G
     volumes:
     - name: root
       size: 20G
@@ -37,5 +47,8 @@ network:
   interfaces:
   - *_network_primary_
 
+
+base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
+
 admin_users_host:
   - equinox
diff --git a/inventory/host_vars/lw-thetys.yml b/inventory/host_vars/lw-thetys.yml
index 77aee114..326c55d7 100644
--- a/inventory/host_vars/lw-thetys.yml
+++ b/inventory/host_vars/lw-thetys.yml
@@ -17,6 +17,7 @@ network:
   interfaces:
   - *_network_primary_
 
+
 admin_users_host:
   - equinox