ch-equinox-ws: re-install on ubuntu jammy

1 files changed, 52 insertions, 40 deletions

diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index 6cbaa529..6ab03bdf 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -1,39 +1,29 @@
 ---
-debian_preseed_language: de
-debian_preseed_country: AT
-debian_preseed_locales:
-  - de_AT.UTF-8
-  - de_DE.UTF-8
-  - en_US.UTF-8
+ubuntu_autoinstall_locale: de_AT
+ubuntu_autoinstall_keyboard_layout: de
+ubuntu_autoinstall_keyboard_variant: nodeadkeys
+ubuntu_autoinstall_timezone: Europe/Vienna
 
-debian_preseed_kernel_image: linux-generic-hwe-20.04
-debian_preseed_no_splash: no
-debian_preseed_install_tasks:
-  - xubuntu-desktop
+ubuntu_autoinstall_desktop: xubuntu
+ubuntu_autoinstall_apt_arches:
+  - amd64
+  - i386
+ubuntu_autoinstall_manual_partitioning: yes
+###
+# mark disk as bootable (EFI System Partition gets created)
+# edit ESP -> size 128M
+# add new GPT Part, whole disk, unformatted -> create new LVM: name ws
+# add new LV, root, 80G, ext4, /
+# add new LV, storage, 1T, unformatted
 
 
 install:
   efi: yes
   disks:
-    primary: /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0MA04112K
-  system_lvm:
-    volumes:
-    - name: root
-      size: 50G
-      filesystem: ext4
-      mountpoint: /
-    - name: var+log
-      size: 768M
-      filesystem: ext4
-      mountpoint: /var/log
-      mount_options:
-      - noatime
-      - nodev
-      - noexec
-    - name: home
-      size: 400G
-      filesystem: ext4
-      mountpoint: /home
+    primary: /dev/disk/by-id/nvme-Samsung_SSD_990_PRO_2TB_S6Z2NF0W501712E
+  kernel_cmdline:
+  - quiet
+  - splash
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
@@ -51,6 +41,8 @@ network:
 base_modules_blacklist: "{{ base_modules_blacklist_none }}"
 
 sshd_password_auth: yes
+ssh_keys_root_extra:
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBjZEFZLrl2KIqYl/GU8Vkp7mlhAbFbjwf4Ht9zQRmI8 ZFS Backup syncoid@epimetheus
 
 zsh_banner: equinox
 
@@ -70,6 +62,32 @@ spreadspace_apt_repo_components:
 wakeonlan_interfaces:
   - enp4s0
 
+zfs_arc_size:
+  min: 512M
+  max: 2G
+
+zfs_pools:
+  storage:
+    mountpoint: /srv/storage
+    create_vdevs: /dev/mapper/ws-storage
+    properties:
+      ashift: 12
+      autotrim: "on"
+
+zfs_sanoid_modules:
+  storage:
+    use_template: production
+    recursive: yes
+    process_children_only: yes
+
+
+ws_base_home_zfs:
+  pool: storage
+  name: home
+  properties:
+    xattr: sa
+    compression: lz4
+    quota: 800G
 
 ws_base_extra_packages:
   - aisleriot
@@ -135,6 +153,7 @@ ws_base_extra_packages:
   - gnome-games
   - gnome-mahjongg
   - gpredict
+  - gpsd-clients
   - gputils
   - graphviz
   - gstreamer1.0-vaapi
@@ -155,7 +174,7 @@ ws_base_extra_packages:
   - kpartx
   - libdbd-mysql-perl
   - libgpgme11
-  - librust-openssl-dev
+  - libncurses5
   - libusb-dev
   - libusb-1.0-0-dev
   - libvirt-clients
@@ -232,6 +251,7 @@ ws_base_extra_packages:
   - signify-openbsd
   - signing-party
   - sigrok-cli
+  - skopeo
   - socat
   - spice-client-gtk
   - sqlite3
@@ -277,8 +297,8 @@ ws_base_extra_packages:
   - yasm
   # needs apt-repo/spreadspace
   - go
-  - info-beamer
-  - helm
+  #- info-beamer  ## TODO: not yet in repo for jammy
+  #- helm         ## TODO: not yet in repo for jammy
   - k9s
   - kubeletctl
   # needs apt-repo/ansible
@@ -291,14 +311,6 @@ ws_base_extra_packages:
   # needs apt-repo/element
   - element-desktop
 
-## needs PPA or other external repo ??
-  # - bazel
-  # - deadbeef
-  # - google-chrome-stable
-  # - opera-stable
-  # - studio-link-standalone
-  # - virtualbox
-  # - youtube-dl
 
 ws_base_xrandr_setup_script: |
   #!/bin/bash