puppet/ssh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Yet more merge conflict errors

Browse Source
This commit is contained in:
mergwyn 2020-07-07 13:39:40 +01:00
parent 4f9e08a9f0
commit 46b6df1240
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -281,7 +281,7 @@ class ssh (
$default_sshd_config_print_motd = 'no' $default_sshd_config_print_motd = 'no'
$default_sshd_config_serverkeybits = undef $default_sshd_config_serverkeybits = undef
$default_sshd_config_subsystem_sftp = '/usr/lib/openssh/sftp-server' $default_sshd_config_subsystem_sftp = '/usr/lib/openssh/sftp-server'
$default_sshd_config_tcp_keepalive = 'yes' $default_sshd_config_tcp_keepalive = undef
$default_sshd_config_use_dns = 'yes' $default_sshd_config_use_dns = 'yes'
$default_sshd_config_xauth_location = undef $default_sshd_config_xauth_location = undef
$default_sshd_gssapiauthentication = 'yes' $default_sshd_gssapiauthentication = 'yes'