Salt/openssh-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/openssh-formula.git synced 2026-07-16 18:36:22 +02:00
Code Issues Activity

test(pillar): add ssh-rsa Kitchen workaround on Gentoo [skip ci]

Browse Source
This commit is contained in:
Imran Iqbal
2022-01-05 06:49:53 +00:00
parent 4ba57d3f92
commit d65ea55d94
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
+1
View File
@@ -180,6 +180,7 @@ values:
AcceptEnv: LANG LC_* AcceptEnv: LANG LC_*
ChallengeResponseAuthentication: 'no' ChallengeResponseAuthentication: 'no'
PrintMotd: 'no' PrintMotd: 'no'
PubkeyAcceptedAlgorithms: "+ssh-rsa"
Subsystem: sftp /usr/lib/openssh/sftp-server Subsystem: sftp /usr/lib/openssh/sftp-server
UsePAM: 'yes' UsePAM: 'yes'
X11Forwarding: 'yes' X11Forwarding: 'yes'
test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
+1
View File
@@ -180,6 +180,7 @@ values:
AcceptEnv: LANG LC_* AcceptEnv: LANG LC_*
ChallengeResponseAuthentication: 'no' ChallengeResponseAuthentication: 'no'
PrintMotd: 'no' PrintMotd: 'no'
PubkeyAcceptedAlgorithms: "+ssh-rsa"
Subsystem: sftp /usr/lib/openssh/sftp-server Subsystem: sftp /usr/lib/openssh/sftp-server
UsePAM: 'yes' UsePAM: 'yes'
X11Forwarding: 'yes' X11Forwarding: 'yes'
test/salt/pillar/default.sls
+1 -1
View File
@@ -27,7 +27,7 @@ sshd_config:
{%- endif %} {%- endif %}
{#- Need this on various platforms to avoid the `kitchen verify` failure as mentioned above; see: #} {#- Need this on various platforms to avoid the `kitchen verify` failure as mentioned above; see: #}
{#- * https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/-/commit/cb6781a2bba9 #} {#- * https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/-/commit/cb6781a2bba9 #}
{%- if grains.os in ["Arch", "OpenBSD"] or grains.get("oscodename", "") in ["openSUSE Tumbleweed"] %} {%- if grains.os in ["Arch", "OpenBSD", "Gentoo"] or grains.get("oscodename", "") in ["openSUSE Tumbleweed"] %}
PubkeyAcceptedAlgorithms: "+ssh-rsa" PubkeyAcceptedAlgorithms: "+ssh-rsa"
{%- endif %} {%- endif %}