Merge branch 'topic/epimetheus-cm4'

10 files changed, 44 insertions, 17 deletions

diff --git a/inventory/host_vars/ch-apps.yml b/inventory/host_vars/ch-apps.yml
index ed53fe38..9c263712 100644
--- a/inventory/host_vars/ch-apps.yml
+++ b/inventory/host_vars/ch-apps.yml
@@ -55,7 +55,7 @@ spreadspace_apt_repo_components:
 
 
 ssh_keys_root_extra:
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIZK9NBainiE0+A8pT8dbwlNZ0k0AZVhLTzUSo3YtKJt ZFS Backup syncoid@epimetheus
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBjZEFZLrl2KIqYl/GU8Vkp7mlhAbFbjwf4Ht9zQRmI8 ZFS Backup syncoid@epimetheus
 
 
 prometheus_job_multitarget_blackbox__probe:
diff --git a/inventory/host_vars/ch-atlas.yml b/inventory/host_vars/ch-atlas.yml
index 7b132e6d..9f1fd63e 100644
--- a/inventory/host_vars/ch-atlas.yml
+++ b/inventory/host_vars/ch-atlas.yml
@@ -26,7 +26,7 @@ network:
 
 
 ssh_keys_root_extra:
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIZK9NBainiE0+A8pT8dbwlNZ0k0AZVhLTzUSo3YtKJt ZFS Backup syncoid@epimetheus
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBjZEFZLrl2KIqYl/GU8Vkp7mlhAbFbjwf4Ht9zQRmI8 ZFS Backup syncoid@epimetheus
 
 
 apt_repo_components:
diff --git a/inventory/host_vars/ch-epimetheus.yml b/inventory/host_vars/ch-epimetheus.yml
index 431f6337..fa05843e 100644
--- a/inventory/host_vars/ch-epimetheus.yml
+++ b/inventory/host_vars/ch-epimetheus.yml
@@ -1,27 +1,33 @@
 ---
-install:
-  efi: true
-  disks:
-    primary: /dev/disk/by-id/ata-ADATA_SP300_1302938101000079
+raspios_variant: lite
+raspios_arch: arm64
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
   domain: "{{ host_domain }}"
   primary: &_network_primary_
-    name: enp1s0
+    name: eth0
     address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}"
     gateway: "{{ network_zones.lan.gateway }}"
   interfaces:
   - *_network_primary_
 
+raspios_boot_config:
+  - regexp: '^#?dtparam=i2c_vc'
+    line: 'dtparam=i2c_vc=on'
+  - regexp: '^#?dtoverlay=i2c-rtc'
+    line: 'dtoverlay=i2c-rtc,rv3028,i2c0'
+
+## TODO: eeprom config...
+#    POWER_OFF_ON_HALT=1
+#    WAKE_ON_GPIO=0
+
+base_entropy_generator: rngd
 
-wakeonlan_interfaces:
-  - enp7s0 ## onboard GBit/s port - enp1s0 is a 10g SFP+ card without support for WOL
 
 apt_repo_components:
   - main
   - contrib  ## for zfs
-  - non-free ## for microcode updates
 
 
 spreadspace_apt_repo_components:
@@ -63,8 +69,8 @@ luks_volumes:
 
 
 zfs_arc_size:
-  min: 8GB
-  max: 16GB
+  min: 1GB
+  max: 2GB
 
 zfs_pools:
   backup:
diff --git a/inventory/host_vars/ch-equinox-t450s.yml b/inventory/host_vars/ch-equinox-t450s.yml
index 5aa92d38..d6a04ace 100644
--- a/inventory/host_vars/ch-equinox-t450s.yml
+++ b/inventory/host_vars/ch-equinox-t450s.yml
@@ -32,7 +32,7 @@ base_modules_blacklist: "{{ base_modules_blacklist_none }}"
 
 sshd_password_auth: yes
 ssh_keys_root_extra:
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIZK9NBainiE0+A8pT8dbwlNZ0k0AZVhLTzUSo3YtKJt ZFS Backup syncoid@epimetheus
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBjZEFZLrl2KIqYl/GU8Vkp7mlhAbFbjwf4Ht9zQRmI8 ZFS Backup syncoid@epimetheus
 
 zsh_banner: equinox
 
diff --git a/inventory/host_vars/ch-hyperion.yml b/inventory/host_vars/ch-hyperion.yml
new file mode 100644
index 00000000..a551242a
--- /dev/null
+++ b/inventory/host_vars/ch-hyperion.yml
@@ -0,0 +1,15 @@
+---
+install:
+  efi: true
+  disks:
+    primary: /dev/disk/by-id/ata-ADATA_SP300_1302938101000079
+
+network:
+  nameservers: "{{ network_zones.lan.dns }}"
+  domain: "{{ host_domain }}"
+  primary: &_network_primary_
+    name: enp1s0
+    address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}"
+    gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
diff --git a/inventory/host_vars/ch-mimas.yml b/inventory/host_vars/ch-mimas.yml
index ac7f1748..2aa8e522 100644
--- a/inventory/host_vars/ch-mimas.yml
+++ b/inventory/host_vars/ch-mimas.yml
@@ -21,7 +21,7 @@ spreadspace_apt_repo_components:
 sshd_allowusers_host: "{{ admin_users_host + (['git'] | product(gitolite_instances | list) | map('join', '-')) }}"
 
 ssh_keys_root_extra:
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIZK9NBainiE0+A8pT8dbwlNZ0k0AZVhLTzUSo3YtKJt ZFS Backup syncoid@epimetheus
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBjZEFZLrl2KIqYl/GU8Vkp7mlhAbFbjwf4Ht9zQRmI8 ZFS Backup syncoid@epimetheus
 
 
 ntp_variant: systemd-timesyncd
diff --git a/inventory/host_vars/ch-phoebe.yml b/inventory/host_vars/ch-phoebe.yml
index 9e1b9d89..834ec6d5 100644
--- a/inventory/host_vars/ch-phoebe.yml
+++ b/inventory/host_vars/ch-phoebe.yml
@@ -30,7 +30,7 @@ apt_repo_components:
 
 
 ssh_keys_root_extra:
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIZK9NBainiE0+A8pT8dbwlNZ0k0AZVhLTzUSo3YtKJt ZFS Backup syncoid@epimetheus
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBjZEFZLrl2KIqYl/GU8Vkp7mlhAbFbjwf4Ht9zQRmI8 ZFS Backup syncoid@epimetheus
 
 
 spreadspace_apt_repo_components:
diff --git a/inventory/host_vars/ch-prometheus.yml b/inventory/host_vars/ch-prometheus.yml
index 20b717c0..332ba8ef 100644
--- a/inventory/host_vars/ch-prometheus.yml
+++ b/inventory/host_vars/ch-prometheus.yml
@@ -42,7 +42,7 @@ apt_repo_components:
 
 ssh_keys_root_extra:
   - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9AkOBxvf1wZ0B3wEyf7O3GbaIGx5o2f6cVuQIrOjeFfgMSAr1LwiB/gmHhMSEq6OSauD37TA5yDIrzk6NPPjVs/wiklsHgYtTqIxSPItTZFPX4gLvNwwGuRvEW9bTEiHd+bVPIiIT7HOje0kgacjan44rdgppX9DgcUp2j7uSZZabsxDCS/ms0slhwBNU1gtR31PoQ56vIya23D2uMauNAbRJzDEOfAjy4pHF8njYcXPas/yrbLi8PUZ1YO1u/AZto96EIYfHaCLWlstqeCX+R2JrTunvfTr8TF3AkFw8lHMzk3neUR+tPAAFQaqeTlqGPiSNq1Oyf+52XR16qwhd equinox@mail
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIZK9NBainiE0+A8pT8dbwlNZ0k0AZVhLTzUSo3YtKJt ZFS Backup syncoid@epimetheus
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBjZEFZLrl2KIqYl/GU8Vkp7mlhAbFbjwf4Ht9zQRmI8 ZFS Backup syncoid@epimetheus
 
 
 spreadspace_apt_repo_components:
diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml
index 6da127ca..8d4f439c 100644
--- a/inventory/host_vars/sk-2019vm.yml
+++ b/inventory/host_vars/sk-2019vm.yml
@@ -29,7 +29,7 @@ ssh_users_root:
   - dan
 
 ssh_keys_root_extra:
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIZK9NBainiE0+A8pT8dbwlNZ0k0AZVhLTzUSo3YtKJt ZFS Backup syncoid@epimetheus
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBjZEFZLrl2KIqYl/GU8Vkp7mlhAbFbjwf4Ht9zQRmI8 ZFS Backup syncoid@epimetheus
 
 apt_repo_components:
   - main
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index c7c21ef0..8e41304d 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -305,6 +305,12 @@ ansible_python_interpreter=/usr/local/bin/python3
 ch-router-obsd
 
 
+[raspios]
+ch-cm4-test
+ch-mclr
+ch-epimetheus
+
+
 ## legacy python version
 [python2:vars]
 ansible_python_interpreter=/usr/bin/python