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 /roles | |
| parent | sk-cloudio/sk-tomnext-nc: update kubernetes (diff) | |
fix installer for openbsd
Diffstat (limited to 'roles')
| -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 |
3 files changed, 5 insertions, 2 deletions
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 |