aboutsummaryrefslogtreecommitdiff
path: root/manifests/dup.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2009-08-28 17:17:25 -0300
committerSilvio Rhatto <rhatto@riseup.net>2009-08-28 17:17:25 -0300
commitb432d94fa72162aa9635217b703ad100b9d39fa2 (patch)
tree238a150b9968c52c3b17aab62cbc5e615b80f94e /manifests/dup.pp
parentf96267fe354a9df417afdc09899c58edf3e67d24 (diff)
downloadpuppet-backupninja-b432d94fa72162aa9635217b703ad100b9d39fa2.tar.gz
puppet-backupninja-b432d94fa72162aa9635217b703ad100b9d39fa2.tar.bz2
New backupninja::client::defaults to avoid duplicates.
Adding part of client.pp code into new class backupninja::client::defaults in an attempt to avoid duplicate definitions inside backupninja::client::key.
Diffstat (limited to 'manifests/dup.pp')
-rw-r--r--manifests/dup.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/dup.pp b/manifests/dup.pp
index 411a44d..6e0330a 100644
--- a/manifests/dup.pp
+++ b/manifests/dup.pp
@@ -90,7 +90,7 @@ define backupninja::duplicity( $order = 90,
$installkey = true ) {
# the client with configs for this machine
- include backupninja::client
+ include backupninja::client::defaults
case $desthost { false: { err("need to define a destination host for remote backups!") } }
case $destdir { false: { err("need to define a destination directory for remote backups!") } }
@@ -119,13 +119,13 @@ define backupninja::duplicity( $order = 90,
}
# the backupninja rule for this duplicity backup
- file { "${backupninja::client::configdir}/${order}_${name}.dup":
+ file { "${backupninja::client::defaults::configdir}/${order}_${name}.dup":
ensure => $ensure,
content => template('backupninja/dup.conf.erb'),
owner => root,
group => root,
mode => 0600,
- require => File["${backupninja::client::configdir}"]
+ require => File["${backupninja::client::defaults::configdir}"]
}
}