diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-02-20 00:56:54 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-02-20 00:56:54 -0200 |
| commit | 98e14e6257f9c15aee4994918ff2d069ed13752a (patch) | |
| tree | 0480ea11d89f646e9e88169e58812b2187770b48 | |
| parent | 54821a0cbea6555adc11d0b4cf63559a92c6d273 (diff) | |
Avoiding duplicate definition of ssh_authorized_key
| -rw-r--r-- | manifests/server.pp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/manifests/server.pp b/manifests/server.pp index a0bcbf2..b6d16b1 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -139,15 +139,17 @@ class backupninja::server { } } default: { - @@ssh_authorized_key{ $real_user: - type => $keytype, - key => $key, - user => $real_user, - target => "${real_ssh_dir}/${real_authorized_keys_file}", - tag => "$real_backuptag", - require => User[$real_user], - } - } + if !defined(Ssh_autorized_key["$real_user"]) { + @@ssh_authorized_key{ "$real_user": + type => $keytype, + key => $key, + user => $real_user, + target => "${real_ssh_dir}/${real_authorized_keys_file}", + tag => "$real_backuptag", + require => User[$real_user], + } + } + } } case $uid { false: { @@ -160,7 +162,7 @@ class backupninja::server { managehome => true, shell => "/bin/sh", password => '*', - require => Group['backupninjas'], + require => Group['backupninjas'], tag => "$real_backuptag" } } @@ -176,7 +178,7 @@ class backupninja::server { managehome => true, shell => "/bin/sh", password => '*', - require => Group['backupninjas'], + require => Group['backupninjas'], tag => "$real_backuptag" } } |