aboutsummaryrefslogtreecommitdiff
path: root/manifests/labelmount.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/labelmount.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/labelmount.pp')
-rw-r--r--manifests/labelmount.pp10
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/labelmount.pp b/manifests/labelmount.pp
index d9158c4..6b1f772 100644
--- a/manifests/labelmount.pp
+++ b/manifests/labelmount.pp
@@ -23,23 +23,23 @@ define backupninja::labelmount($order = 10,
$label,
$dest
) {
- include backupninja::client
- file { "${backupninja::client::configdir}/${order}_${name}.labelmount":
+ include backupninja::client::defaults
+ file { "${backupninja::client::defaults::configdir}/${order}_${name}.labelmount":
ensure => $ensure,
content => template('backupninja/labelmount.conf.erb'),
owner => root,
group => root,
mode => 0600,
- require => File["${backupninja::client::configdir}"]
+ require => File["${backupninja::client::defaults::configdir}"]
}
- file { "${backupninja::client::configdir}/99_${name}.umount":
+ file { "${backupninja::client::defaults::configdir}/99_${name}.umount":
ensure => $ensure,
content => template('backupninja/umount.conf.erb'),
owner => root,
group => root,
mode => 0600,
- require => File["${backupninja::client::configdir}"]
+ require => File["${backupninja::client::defaults::configdir}"]
}
# Copy over the handler scripts themselves, since they're not in the