From 7f1ce0ed46867239d2158a43c1446dffeb131827 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 27 Apr 2024 18:28:19 +0200 Subject: fix installer for openbsd --- roles/installer/openbsd/autoinstall/templates/install.site.j2 | 2 +- roles/installer/openbsd/fetch/vars/main.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'roles/installer') 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 -- cgit v1.2.3