diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2024-04-27 18:28:19 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2024-04-27 18:28:19 +0200 |
| commit | 7f1ce0ed46867239d2158a43c1446dffeb131827 (patch) | |
| tree | 11a19d020b85212d4e6ca1fd3bbd0354338865a4 | |
| parent | sk-cloudio/sk-tomnext-nc: update kubernetes (diff) | |
fix installer for openbsd
| -rw-r--r-- | inventory/group_vars/chaos-at-home/vars.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/ch-router-obsd.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ch-testvm-prometheus.yml | 2 | ||||
| -rw-r--r-- | roles/greenbone/target/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/installer/openbsd/autoinstall/templates/install.site.j2 | 2 | ||||
| -rw-r--r-- | roles/installer/openbsd/fetch/vars/main.yml | 3 |
6 files changed, 9 insertions, 3 deletions
diff --git a/inventory/group_vars/chaos-at-home/vars.yml b/inventory/group_vars/chaos-at-home/vars.yml index 316d28a3..0cc12f3b 100644 --- a/inventory/group_vars/chaos-at-home/vars.yml +++ b/inventory/group_vars/chaos-at-home/vars.yml @@ -47,7 +47,7 @@ chaos_at_home_internal_ca_cert: | greenbone_target_user_ssh_keys: - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0TJ4KzssVol0mV/EIe8ckYJgr3HBhaYdYDdyKQvzPSHwi8ZA9Ajc4lDSP5WNn9YHixc3G/JXcWvzkBjfQKCT0UlrJiFP/+t35rImLSt6MwEhWJzqiP7yZNExp3yVQSBMY6sS8Zbpg6o8hlnZJPuqEvbTDQL4lKplJjuv8AprBd1O0OhixEySps7KP7bA94jh1lq0Rp+u7snwTm0cZKTQ00s7yLvQ5psvm0E/9FTIZtzkMG8lq/kxBqK20+tw5EZOvxIrR1KQszZBfgHY5s6enjj8eqHv/aa/CryvrbFXUxpfNJUVEkzpaRBWZDRnGn2usFz8YOR0wEy4gNgG6Zx1tce1bsQvmesJWpvbT3eNf74GowR3vEoaZNJHXhEkBrmKYbbddRgkFrePU4V6/QINuT93hIiz3/vrUeuh0gcWhFWRsRer4CHtHT2Wzw+rl6VNW4AyqRSBeZ6qLwu9/6obWPcrafgt/wItk3G6EIXTpRHT7Xz2sVAW2uiAXQenWdas= + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCp5xbhNTsOYmru13vk/MKNa58SDcJJyjfRiktfr3E4HDkxJLQTecnydD+jibvd8uE/1CfaCY0bomeTLdOiZPYqMmdS3TRHdlTLaugtbnkd7q9phux43m+VPVyGelIb4Z9Stb+wOiih81yVxk6gHS6Dec1ZVxVALNpHsQV918K1qt6i7QwACsaAB84NUTyEQT26HiT8muoOcMhVjM2+MyC/omRZElTTv8XANywT/IOwngh/BOVv/bxQzGUNBv8X9n8wbYopkkiQaCuKqD0b/53QKVWqn34LlAB3BM6XuFzArG2gSIQqxvVHWx2LbFxLjvAUtd4cDcw9xMDftAKRCO/Zay9RPg/ul1vJfboBoBTveMGSTz5MqbOf/K8nxO7r/eI9fLH0Tn44FrtytsKu9hwntdEr88zwKti2Dd7l7FMWEVLXbZJgV/mI4TvD+kNepauAeMiyf2TIw+hjDmIv2t0wfPKItsrj2SvDrndbnxotfWL+1LnSw0Axe4DHfz4MORM= whawty_auth_store__chaos_at_home: diff --git a/inventory/host_vars/ch-router-obsd.yml b/inventory/host_vars/ch-router-obsd.yml index 61496df0..98ac58f6 100644 --- a/inventory/host_vars/ch-router-obsd.yml +++ b/inventory/host_vars/ch-router-obsd.yml @@ -30,5 +30,6 @@ network: interfaces: - *_network_primary_ +sshd_allowusers_host: "{{ normal_users_host | union(admin_users_host) | union(['greenbone']) }}" # https://www.pauladamsmith.com/blog/2018/07/fixing-bufferbloat-on-your-home-network-with-openbsd-6.2-or-newer.html diff --git a/inventory/host_vars/ch-testvm-prometheus.yml b/inventory/host_vars/ch-testvm-prometheus.yml index 415e6774..879ef694 100644 --- a/inventory/host_vars/ch-testvm-prometheus.yml +++ b/inventory/host_vars/ch-testvm-prometheus.yml @@ -35,3 +35,5 @@ network: - *_network_primary_ ntp_variant: systemd-timesyncd + +sshd_allowusers_host: "{{ normal_users_host | union(admin_users_host) | union(['greenbone']) }}" diff --git a/roles/greenbone/target/tasks/main.yml b/roles/greenbone/target/tasks/main.yml index 8acc10cb..4c019e5a 100644 --- a/roles/greenbone/target/tasks/main.yml +++ b/roles/greenbone/target/tasks/main.yml @@ -4,7 +4,7 @@ name: "{{ greenbone_target_username }}" home: /var/lib/greenbone create_home: yes - shell: /bin/bash + shell: /bin/sh system: yes state: present diff --git a/roles/installer/openbsd/autoinstall/templates/install.site.j2 b/roles/installer/openbsd/autoinstall/templates/install.site.j2 index 72daa488..1c2313c8 100644 --- a/roles/installer/openbsd/autoinstall/templates/install.site.j2 +++ b/roles/installer/openbsd/autoinstall/templates/install.site.j2 @@ -10,7 +10,7 @@ EOF {% if ansible_port is defined %} echo "Setting SSH port to {{ ansible_port }}" -sed -e 's/^\s*#*\s*Port\s\s*[0-9][0-9]*$/Port {{ ansible_port }}/' -i /etc/ssh/sshd_config +sed -e 's/^[ \t]*#*[ \t]*Port[ \t][ \t]*[0-9][0-9]*$/Port {{ ansible_port }}/' -i /etc/ssh/sshd_config {% endif %} echo "Installing python" diff --git a/roles/installer/openbsd/fetch/vars/main.yml b/roles/installer/openbsd/fetch/vars/main.yml index 6abb571e..dda7f601 100644 --- a/roles/installer/openbsd/fetch/vars/main.yml +++ b/roles/installer/openbsd/fetch/vars/main.yml @@ -23,3 +23,6 @@ openbsd_installer_signing_keys: "7.4": | untrusted comment: openbsd 7.4 public key RWRoyQmAD08ajTqgzK3UcWaVlwaJMckH9/CshU8Md5pN1GoIrcBdTF+c + "7.5": | + untrusted comment: openbsd 7.5 base public key + RWRGj1pRpprAfgeF/rgld4ubduChLvTkigA1Zj7WLDsVA4qfYSWOEI8q |