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

Added sles15 resolved issue #320

Browse Source
This commit is contained in:
Francisco Calero 2020-01-22 16:08:03 +01:00
parent abb9440a35
commit 3f623d5cb6
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -35,6 +35,7 @@ for the exact matrix of supported Puppet and ruby versions.
* SLES 10 * SLES 10
* SLES 11 * SLES 11
* SLES 12 * SLES 12
* SLES 15
* Ubuntu 12.04 LTS * Ubuntu 12.04 LTS
* Ubuntu 14.04 LTS * Ubuntu 14.04 LTS
* Ubuntu 16.04 LTS * Ubuntu 16.04 LTS

16
manifests/init.pp
View File

@ -171,17 +171,27 @@ class ssh (
$default_sshd_gssapicleanupcredentials = 'yes' $default_sshd_gssapicleanupcredentials = 'yes'
$default_sshd_acceptenv = true $default_sshd_acceptenv = true
$default_service_hasstatus = true $default_service_hasstatus = true
$default_sshd_config_serverkeybits = '1024'
$default_sshd_config_hostkey = [ '/etc/ssh/ssh_host_rsa_key' ] $default_sshd_config_hostkey = [ '/etc/ssh/ssh_host_rsa_key' ]
$default_sshd_addressfamily = 'any' $default_sshd_addressfamily = 'any'
$default_sshd_config_tcp_keepalive = 'yes' $default_sshd_config_tcp_keepalive = 'yes'
$default_sshd_config_permittunnel = 'no' $default_sshd_config_permittunnel = 'no'
case $::architecture { case $::architecture {
'x86_64': { 'x86_64': {
if ($::operatingsystem == 'SLES') and ($::operatingsystemrelease =~ /^12\./) { if ($::operatingsystem == 'SLES') {
case $::operatingsystemrelease {
/12\./: {
$default_sshd_config_subsystem_sftp = '/usr/lib/ssh/sftp-server' $default_sshd_config_subsystem_sftp = '/usr/lib/ssh/sftp-server'
} else { $default_sshd_config_serverkeybits = '1024'
}
/15\./: {
$default_sshd_config_subsystem_sftp = '/usr/lib/ssh/sftp-server'
$default_sshd_config_serverkeybits = undef
}
default: {
$default_sshd_config_subsystem_sftp = '/usr/lib64/ssh/sftp-server' $default_sshd_config_subsystem_sftp = '/usr/lib64/ssh/sftp-server'
$default_sshd_config_serverkeybits = '1024'
}
}
} }
} }
'i386' : { 'i386' : {

3
metadata.json
View File

@ -67,7 +67,8 @@
"operatingsystemrelease": [ "operatingsystemrelease": [
"10", "10",
"11", "11",
"12" "12",
"15"
] ]
}, },
{ {