aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-12-08 23:40:45 -0500
committerMicah Anderson <micah@riseup.net>2009-12-08 23:40:45 -0500
commit794d77183ad6fc79ad15dd2e5fecc9cf4cd3a162 (patch)
tree99fea432d525c41f5baebbb47a003efd96099bd3
parentf1c057463a4600dc7e69d979062fe67b2809562e (diff)
parent7c78d97a7b961565292cfb1a118a7af3bc25b1cc (diff)
downloadpuppet-backupninja-794d77183ad6fc79ad15dd2e5fecc9cf4cd3a162.tar.gz
puppet-backupninja-794d77183ad6fc79ad15dd2e5fecc9cf4cd3a162.tar.bz2
Merge remote branch 'anarcat/master'
-rw-r--r--manifests/client.pp3
-rw-r--r--manifests/rdiff.pp2
2 files changed, 3 insertions, 2 deletions
diff --git a/manifests/client.pp b/manifests/client.pp
index acff367..95e3905 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -36,7 +36,8 @@ class backupninja::client::defaults {
ensure => '0.9.6-4';
}
file { $configdir:
- ensure => directory
+ ensure => directory,
+ mode => 750, owner => 0, group => 0;
}
}
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 2624ecd..38a975d 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -27,7 +27,7 @@ define backupninja::rdiff(
$ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true, $key = false,
$backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false)
{
- include backupninja::client::rdiff-backup
+ include backupninja::client::rdiff_backup
case $type {
'remote': {