From 0f744b1c483f0ed0811d76743c6e619eb980b7ed Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 21 May 2008 19:39:58 +0000
Subject: fix backupkeys variable

---
 manifests/server.pp | 14 +++++---------
 1 file 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,
-- 
cgit v1.2.3