diff options
-rw-r--r-- | manifests/rdiff.pp | 5 | ||||
-rw-r--r-- | manifests/server.pp | 24 |
2 files changed, 16 insertions, 13 deletions
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp index 587c02d..f750e23 100644 --- a/manifests/rdiff.pp +++ b/manifests/rdiff.pp @@ -25,7 +25,8 @@ define backupninja::rdiff( "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ], $vsinclude = false, $keep = 30, $sshoptions = false, $options = '--force', $ssh_dir_manage = true, $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true, $key = false, - $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false, $nagios2_description = 'backups') + $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false, + $nagios2_description = 'backups', $subfolder = 'rdiff-backup') { include backupninja::client::rdiff_backup @@ -41,7 +42,7 @@ define backupninja::rdiff( false => "/home/${user}-${name}", default => $home, } - $directory = "$real_home/rdiff-backup/" + $directory = "${real_home}/${subfolder}/" backupninja::server::sandbox { 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" } } |