From b6907bf14f9ef8a9a4fc905a4d6231295ee9c596 Mon Sep 17 00:00:00 2001 From: Phil Friderici Date: Wed, 16 Oct 2013 11:29:11 +0200 Subject: [PATCH 1/2] Added support for Suse --- README.md | 1 + manifests/init.pp | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 253e566..4f67661 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ This module has been tested to work on the following systems. * EL 5 * EL 6 + * SLES 11 === diff --git a/manifests/init.pp b/manifests/init.pp index f502a6d..7a9a1b2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -88,8 +88,20 @@ class ssh ( 'openssh-clients'] $default_sshd_config_subsystem_sftp = '/usr/libexec/openssh/sftp-server' } + 'Suse': { + $default_packages = 'openssh' + if $::architecture == 'x86_64' { + $default_sshd_config_subsystem_sftp = '/usr/lib64/ssh/sftp-server' + } + elsif $::architecture == 'i386' { + $default_sshd_config_subsystem_sftp = '/usr/lib/ssh/sftp-server' + } + else { + fail("ssh supports architecture x86_64 & i386 for Suse. Detected architecture is <${::architecture}>.") + } + } default: { - fail("ssh supports osfamily RedHat. Detected osfamily is <${::osfamily}>.") + fail("ssh supports osfamily RedHat & Suse. Detected osfamily is <${::osfamily}>.") } } From 812465b67777b36ccb950ced21c2f7b5dee6b69d Mon Sep 17 00:00:00 2001 From: Phil Friderici Date: Thu, 17 Oct 2013 15:39:10 +0200 Subject: [PATCH 2/2] Changed: usage of case instead of if-else, removed typos --- manifests/init.pp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 7a9a1b2..fc8c4e1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -90,18 +90,20 @@ class ssh ( } 'Suse': { $default_packages = 'openssh' - if $::architecture == 'x86_64' { - $default_sshd_config_subsystem_sftp = '/usr/lib64/ssh/sftp-server' - } - elsif $::architecture == 'i386' { - $default_sshd_config_subsystem_sftp = '/usr/lib/ssh/sftp-server' - } - else { - fail("ssh supports architecture x86_64 & i386 for Suse. Detected architecture is <${::architecture}>.") + case $::architecture { + 'x86_64': { + $default_sshd_config_subsystem_sftp = '/usr/lib64/ssh/sftp-server' + } + 'i386' : { + $default_sshd_config_subsystem_sftp = '/usr/lib/ssh/sftp-server' + } + default: { + fail("ssh supports architectures x86_64 and i386 for Suse. Detected architecture is <${::architecture}>.") + } } } default: { - fail("ssh supports osfamily RedHat & Suse. Detected osfamily is <${::osfamily}>.") + fail("ssh supports osfamilies RedHat and Suse. Detected osfamily is <${::osfamily}>.") } }