From 3f623d5cb66802167bfcf008c8598c5efa7d281c Mon Sep 17 00:00:00 2001 From: Francisco Calero Date: Wed, 22 Jan 2020 16:08:03 +0100 Subject: [PATCH] Added sles15 resolved issue #320 --- README.md | 1 + manifests/init.pp | 20 +++++++++++++++----- metadata.json | 3 ++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d2b934d..8eab242 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/manifests/init.pp b/manifests/init.pp index 66788b9..c077a75 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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\./) { - $default_sshd_config_subsystem_sftp = '/usr/lib/ssh/sftp-server' - } else { - $default_sshd_config_subsystem_sftp = '/usr/lib64/ssh/sftp-server' + if ($::operatingsystem == 'SLES') { + case $::operatingsystemrelease { + /12\./: { + $default_sshd_config_subsystem_sftp = '/usr/lib/ssh/sftp-server' + $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' : { diff --git a/metadata.json b/metadata.json index 3ca9272..cf2d066 100644 --- a/metadata.json +++ b/metadata.json @@ -67,7 +67,8 @@ "operatingsystemrelease": [ "10", "11", - "12" + "12", + "15" ] }, {