diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-07-13 18:39:18 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-07-13 18:39:18 -0300 |
| commit | 99928cd61e67836d39aad9e2b2ce8b06badf0f0b (patch) | |
| tree | 0900294971db6f5781a99424ff9842291b700b8f /manifests | |
| parent | 4d73d3784e074b719ef43efe152cb7d38ce24c7e (diff) | |
| parent | 779d27e0ae3e5430d11ea5b3084893c16466b5c0 (diff) | |
Merge branch 'master' of git://labs.riseup.net/shared-sshd
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 7 | ||||
| -rw-r--r-- | manifests/ssh_authorized_key.pp | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index bfefaab..af25e9e 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 = '' } } @@ -99,7 +102,7 @@ class sshd { '': { $sshd_use_strong_ciphers = "no" } } - include sshd::client + include sshd::client case $operatingsystem { gentoo: { include sshd::gentoo } @@ -107,7 +110,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 { diff --git a/manifests/ssh_authorized_key.pp b/manifests/ssh_authorized_key.pp index bf188d8..40649b0 100644 --- a/manifests/ssh_authorized_key.pp +++ b/manifests/ssh_authorized_key.pp @@ -3,7 +3,7 @@ define sshd::ssh_authorized_key( $ensure = 'present', $type = 'ssh-dss', $key = 'absent', - $user = 'root', + $user = '', $target = undef, $options = 'absent' ){ @@ -22,7 +22,7 @@ define sshd::ssh_authorized_key( undef,'': { case $real_user { 'root': { $real_target = '/root/.ssh/authorized_keys' } - default: { $real_target = "/home/${user}/.ssh/authorized_keys" } + default: { $real_target = "/home/${real_user}/.ssh/authorized_keys" } } } default: { |