Added sles15 resolved issue #320
This commit is contained in:
parent
abb9440a35
commit
3f623d5cb6
@ -35,6 +35,7 @@ for the exact matrix of supported Puppet and ruby versions.
|
||||
* SLES 10
|
||||
* SLES 11
|
||||
* SLES 12
|
||||
* SLES 15
|
||||
* Ubuntu 12.04 LTS
|
||||
* Ubuntu 14.04 LTS
|
||||
* Ubuntu 16.04 LTS
|
||||
|
@ -171,17 +171,27 @@ class ssh (
|
||||
$default_sshd_gssapicleanupcredentials = 'yes'
|
||||
$default_sshd_acceptenv = true
|
||||
$default_service_hasstatus = true
|
||||
$default_sshd_config_serverkeybits = '1024'
|
||||
$default_sshd_config_hostkey = [ '/etc/ssh/ssh_host_rsa_key' ]
|
||||
$default_sshd_addressfamily = 'any'
|
||||
$default_sshd_config_tcp_keepalive = 'yes'
|
||||
$default_sshd_config_permittunnel = 'no'
|
||||
case $::architecture {
|
||||
'x86_64': {
|
||||
if ($::operatingsystem == 'SLES') and ($::operatingsystemrelease =~ /^12\./) {
|
||||
if ($::operatingsystem == 'SLES') {
|
||||
case $::operatingsystemrelease {
|
||||
/12\./: {
|
||||
$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_serverkeybits = '1024'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
'i386' : {
|
||||
|
@ -67,7 +67,8 @@
|
||||
"operatingsystemrelease": [
|
||||
"10",
|
||||
"11",
|
||||
"12"
|
||||
"12",
|
||||
"15"
|
||||
]
|
||||
},
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user