diff options
| author | Micah Anderson <micah@riseup.net> | 2011-06-21 11:46:42 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-06-21 11:46:42 -0400 |
| commit | 779d27e0ae3e5430d11ea5b3084893c16466b5c0 (patch) | |
| tree | ac0709e8aa45d779e5cb90c634a1a8be0ea7a77b /manifests | |
| parent | bbfc7c04ba5c2a1c86817cd5864dba608cedb68d (diff) | |
| parent | 95bf6e032bda5c2799d44b5fb6aa6c46c109d0d8 (diff) | |
Merge remote-tracking branch 'lelutin/freebsd'
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 4 | ||||
| -rw-r--r-- | manifests/ssh_authorized_key.pp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index cc5f10e..e933a46 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -93,7 +93,7 @@ class sshd { '': { $sshd_ensure_version = "present" } } - include sshd::client + include sshd::client case $operatingsystem { gentoo: { include sshd::gentoo } @@ -101,7 +101,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: { |