diff options
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/host_vars/ch-epimetheus.yml | 14 | ||||
| -rw-r--r-- | inventory/host_vars/ch-equinox-t450s.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ch-equinox-ws.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ch-jump.yml | 3 | ||||
| -rw-r--r-- | inventory/host_vars/sgg-icecast.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/sk-cloudio/vars.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/sk-tomnext-nc.yml | 2 |
7 files changed, 14 insertions, 11 deletions
diff --git a/inventory/host_vars/ch-epimetheus.yml b/inventory/host_vars/ch-epimetheus.yml index 6ade6af4..147c22ff 100644 --- a/inventory/host_vars/ch-epimetheus.yml +++ b/inventory/host_vars/ch-epimetheus.yml @@ -22,18 +22,18 @@ apt_repo_components: luks_volumes: - # crypto-sata0: - # passphrase: "{{ vault_luks_volumes['crypto-sata0'].passphrase }}" - # device: /dev/disk/by-id/ata-WDC_WD30EFRX-68AX9N0_WD-WMC1T1674991 + crypto-sata0: + passphrase: "{{ vault_luks_volumes['crypto-sata0'].passphrase }}" + device: /dev/disk/by-id/ata-WDC_WD30EFRX-68EUZN0_WD-WCC4N6ZP3KFJ crypto-sata1: passphrase: "{{ vault_luks_volumes['crypto-sata1'].passphrase }}" - device: /dev/disk/by-id/ata-WDC_WD30EFRX-68AX9N0_WD-WMC1T1357355 + device: /dev/disk/by-id/ata-ST4000VN008-2DR166_ZGY976JP crypto-sata2: passphrase: "{{ vault_luks_volumes['crypto-sata2'].passphrase }}" device: /dev/disk/by-id/ata-WDC_WD30EFRX-68AX9N0_WD-WMC1T1522231 crypto-sata3: passphrase: "{{ vault_luks_volumes['crypto-sata3'].passphrase }}" - device: /dev/disk/by-id/ata-WDC_WD30EFRX-68AX9N0_WD-WMC1T1696205 + device: /dev/disk/by-id/ata-ST4000VN008-2DR166_ZGY9802C zfs_arc_size: @@ -43,8 +43,7 @@ zfs_arc_size: zfs_pools: backup: mountpoint: /srv/backup -# create_vdevs: raidz /dev/mapper/crypto-sata0 /dev/mapper/crypto-sata1 /dev/mapper/crypto-sata2 /dev/mapper/crypto-sata3 - create_vdevs: raidz /dev/mapper/crypto-sata1 /dev/mapper/crypto-sata2 /dev/mapper/crypto-sata3 + create_vdevs: raidz /dev/mapper/crypto-sata0 /dev/mapper/crypto-sata1 /dev/mapper/crypto-sata2 /dev/mapper/crypto-sata3 zfs_sanoid_templates: @@ -88,7 +87,6 @@ zfs_syncoid_sources: recursive: yes skip_parent: yes exclude: - - '^storage/backups' - '^storage/vm' 'ch-equinox-t450s': ssh_hostname: 192.168.28.103 diff --git a/inventory/host_vars/ch-equinox-t450s.yml b/inventory/host_vars/ch-equinox-t450s.yml index 28ac168c..14773889 100644 --- a/inventory/host_vars/ch-equinox-t450s.yml +++ b/inventory/host_vars/ch-equinox-t450s.yml @@ -76,6 +76,7 @@ ws_base_extra_packages: - avr-libc - avrdude - binutils-avr + - binwalk - bison - build-essential - cheese diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml index ffb12845..8f4b709e 100644 --- a/inventory/host_vars/ch-equinox-ws.yml +++ b/inventory/host_vars/ch-equinox-ws.yml @@ -76,6 +76,7 @@ ws_base_extra_packages: - avr-libc - avrdude - binutils-avr + - binwalk - bison - build-essential - cheese diff --git a/inventory/host_vars/ch-jump.yml b/inventory/host_vars/ch-jump.yml index 5c041670..3152435e 100644 --- a/inventory/host_vars/ch-jump.yml +++ b/inventory/host_vars/ch-jump.yml @@ -43,3 +43,6 @@ sshd_jump_users: authorized_keys: "{{ users.equinox.ssh }}" spel: authorized_keys: "{{ users.spel.ssh }}" + fim: + authorized_keys: + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzW8lF2i036gsT2BHaOzpHLZUZkit5FsoYHWaiuc9xmruuhzHDzADV17RBMckaIkXRmPnC4I3AZdfFO+RO/7bBdDMAOTw9eyKAcqVWEaR3JDc8C+TFSj8HKRi52jrRXsGD1epJFmhwOFV4VdMXKGlnLrEpTBKn+ZPf6x6bm5pDSfVR3U9nTuXNT/vs+FkrJPvkUZ3iA1cAnK8cRd7Dkasrob9YiskwhWDLSS0bmvTUZatQUqrfUmVcXQqyCkqvHhbOVdYx+gWsjpKHuykSyQEqLTBRzb9UmvzCRjN7sq+QoMRv/CoT1cQjAsgHk4D2tadXuNvRqTgLqrifwK4F3XnCfR+29twm4wSKY+6NKjHjECvJ63JcBFu3jHLXN3ph4va9Tfegkt07W7pdnfrqYxp7veCTyufuByMmReo8s1dwNb2nuBS0HN7Unv2x42ClAzox60QJFgf4sOFCVvJPzhr4mO3ZXahuR75VPYHmsp3TGJZ8RekNyZspD9KWw3FuRiNsYHP/QEFI0gg7X0w7rRQ2CaALA6NGmko0nyTo8CiRkMWVY8rhwJiQ1Eb+mQRW0Y35yqegw3oG/OHEEYIoKD8/Or4KqmrBzGRmFogDjEGmB91iO8XxwfrR+RD3kY34xSr7FXVIYFMK1b3Y4GJ80z6CzU7C2M80wxRww8hqRO1AIw== fim@digl012 diff --git a/inventory/host_vars/sgg-icecast.yml b/inventory/host_vars/sgg-icecast.yml index 2c279e30..cab24c65 100644 --- a/inventory/host_vars/sgg-icecast.yml +++ b/inventory/host_vars/sgg-icecast.yml @@ -52,7 +52,7 @@ kubelet_storage: size: 2G fs: ext4 -kubernetes_version: 1.21.0 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/sk-cloudio/vars.yml b/inventory/host_vars/sk-cloudio/vars.yml index 64e651f3..d492fbdb 100644 --- a/inventory/host_vars/sk-cloudio/vars.yml +++ b/inventory/host_vars/sk-cloudio/vars.yml @@ -64,7 +64,7 @@ kubelet_storage: properties: quota: 20G -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_pod_cidr: 192.168.255.0/24 diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml index 5f89a32c..57c79ba2 100644 --- a/inventory/host_vars/sk-tomnext-nc.yml +++ b/inventory/host_vars/sk-tomnext-nc.yml @@ -94,7 +94,7 @@ kubelet_storage: properties: quota: 15G -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 15 kubernetes_standalone_pod_cidr: 192.168.255.0/24 |