diff options
author | mh <mh@immerda.ch> | 2011-07-29 19:31:41 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2011-07-29 19:31:41 +0200 |
commit | cb7cd9e314fad2cf8eb8d2c524e17a1c3e3e94d2 (patch) | |
tree | 35ebac01729e545fae37083e5051f18aaa6c214b /manifests/init.pp | |
parent | 7a44f28880a57814c26ed06c7d066c11a605cc70 (diff) | |
parent | 0e9e1b6f2c5dca80c946f7944d47f1d28ba76920 (diff) | |
download | puppet-sshd-cb7cd9e314fad2cf8eb8d2c524e17a1c3e3e94d2.tar.gz puppet-sshd-cb7cd9e314fad2cf8eb8d2c524e17a1c3e3e94d2.tar.bz2 |
Merge remote-tracking branch 'shared/master'
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 991fbba..8b3361c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -77,6 +77,9 @@ class sshd { case $sshd_authorized_keys_file { '': { $sshd_authorized_keys_file = "%h/.ssh/authorized_keys" } } + case $sshd_hardened_ssl { + '': { $sshd_hardened_ssl = 'no' } + } case $sshd_sftp_subsystem { '': { $sshd_sftp_subsystem = '' } } @@ -89,8 +92,19 @@ class sshd { case $sshd_ensure_version { '': { $sshd_ensure_version = "present" } } + case $sshd_print_motd { + '': { + case $operatingsystem { + debian,ubuntu: { $sshd_print_motd = "no" } + default: { $sshd_print_motd = "yes" } + } + } + } + case $sshd_shared_ip { + '': { $sshd_shared_ip = "no" } + } - include sshd::client + include sshd::client case $operatingsystem { gentoo: { include sshd::gentoo } @@ -98,7 +112,7 @@ class sshd { centos: { include sshd::centos } openbsd: { include sshd::openbsd } debian,ubuntu: { include sshd::debian } - default: { include sshd::default } + default: { include sshd::base } } if $use_nagios { |