aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2008-05-21 19:39:58 +0000
committerMicah Anderson <micah@riseup.net>2008-05-21 19:39:58 +0000
commit0f744b1c483f0ed0811d76743c6e619eb980b7ed (patch)
treebeab5c78aad05aafa793857a91c65edb3cbc8d62
parent6adbb4f335e0bd1a481df371339efa5dae907450 (diff)
downloadpuppet-backupninja-0f744b1c483f0ed0811d76743c6e619eb980b7ed.tar.gz
puppet-backupninja-0f744b1c483f0ed0811d76743c6e619eb980b7ed.tar.bz2
fix backupkeys variable
-rw-r--r--manifests/server.pp14
1 files changed, 5 insertions, 9 deletions
diff --git a/manifests/server.pp b/manifests/server.pp
index 25111f8..c91a479 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -3,10 +3,6 @@ class backupninja::server {
'' => "/backup",
default => $backupdir,
}
- $real_backupkeys = $backupkeys ? {
- '' => "$fileserver/keys/backupkeys",
- default => $backupkeys,
- }
$real_backupserver_tag = $backupserver_tag? {
'' => $fqdn,
default => $backupserver_tag
@@ -24,19 +20,19 @@ 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, $keys = false, $uid = false, $gid = "backupninjas") {
+ define sandbox($host = false, $dir = false, $backupkeys = false, $uid = false, $gid = "backupninjas") {
$real_host = $host ? {
false => $fqdn,
default => $host,
}
+ $real_backupkeys = $backupkeys ? {
+ false => "$fileserver/keys/backupkeys",
+ default => $backupkeys,
+ }
$real_dir = $dir ? {
false => "${backupninja::server::real_backupdir}/$fqdn",
default => $dir,
}
- $real_keys = $keys ? {
- false => "${backupninja::server::real_backupkeys}",
- default => $keys,
- }
@@file { "$real_dir":
ensure => directory,
mode => 750, owner => $name, group => 0,