aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2008-05-21 18:57:37 +0000
committerMicah Anderson <micah@riseup.net>2008-05-21 18:57:37 +0000
commit8988c6c5e6ff77b49ab303ab2ba405acf429ea03 (patch)
treef772e01beeae64ae198772571ff7b6e9a92972b6
parentba5f41284e8b55bc2eb3c5c8c1dcad1844214e7a (diff)
downloadpuppet-backupninja-8988c6c5e6ff77b49ab303ab2ba405acf429ea03.tar.gz
puppet-backupninja-8988c6c5e6ff77b49ab303ab2ba405acf429ea03.tar.bz2
flip the override variables, when setting these, you are going to want to set
$backupdir, not $backupdir_override
-rw-r--r--manifests/server.pp20
1 files changed, 10 insertions, 10 deletions
diff --git a/manifests/server.pp b/manifests/server.pp
index 10ff5a7..2ce2a34 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -1,17 +1,17 @@
class backupninja::server {
- $backupdir = $backupdir_override ? {
+ $real_backupdir = $backupdir ? {
'' => "/backup",
- default => $backupdir_override,
+ default => $backupdir,
}
- $backupkeys = $backupkeys_override ? {
+ $real_backupkeys = $backupkeys ? {
'' => "$fileserver/keys/backupkeys",
- default => $backupkeys_override,
+ default => $backupkeys,
}
group { "backupninjas":
ensure => "present",
gid => 700
}
- file { "$backupdir":
+ file { "$real_backupdir":
ensure => "directory",
mode => 710, owner => root, group => "backupninjas"
}
@@ -20,18 +20,18 @@ class backupninja::server {
# this define allows nodes to declare a remote backup sandbox, that have to
# get created on the server
- define sandbox($host = false, $dir = false, $uid = false, $gid = "backupninjas") {
+ define sandbox($host = false, $dir = false, $keys = false, $uid = false, $gid = "backupninjas") {
$real_host = $host ? {
false => $fqdn,
default => $host,
}
$real_dir = $dir ? {
- false => "${backupninja::server::backupdir}/$fqdn",
+ false => "${backupninja::server::real_backupdir}/$fqdn",
default => $dir,
}
- $real_backupkeys = $backupkeys ? {
- false => "${backupninja::server::backupkeys}",
- default => $backupkeys,
+ $real_keys = $keys ? {
+ false => "${backupninja::server::real_backupkeys}",
+ default => $keys,
}
@@file { "$real_dir":
ensure => directory,