From 98e14e6257f9c15aee4994918ff2d069ed13752a Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 20 Feb 2010 00:56:54 -0200
Subject: Avoiding duplicate definition of ssh_authorized_key

---
 manifests/server.pp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index a0bcbf2..b6d16b1 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -139,15 +139,17 @@ class backupninja::server {
             }
 	  }
 	  default: {
-	    @@ssh_authorized_key{ $real_user:
-	      type => $keytype,
-              key => $key,
-	      user => $real_user,
-	      target => "${real_ssh_dir}/${real_authorized_keys_file}",
-       	      tag => "$real_backuptag",
-	      require => User[$real_user],
-            }
-          }
+              if !defined(Ssh_autorized_key["$real_user"]) {
+                @@ssh_authorized_key{ "$real_user":
+                  type    => $keytype,
+                  key     => $key,
+                  user    => $real_user,
+                  target  => "${real_ssh_dir}/${real_authorized_keys_file}",
+                  tag     => "$real_backuptag",
+                  require => User[$real_user],
+                }
+              }
+     }
 	}
         case $uid {
           false: {
@@ -160,7 +162,7 @@ class backupninja::server {
                 managehome => true,
                 shell   => "/bin/sh",
                 password => '*',
-	        require => Group['backupninjas'],
+                require => Group['backupninjas'],
                 tag => "$real_backuptag"
               }
             }
@@ -176,7 +178,7 @@ class backupninja::server {
                 managehome => true,
                 shell   => "/bin/sh",
                 password => '*',
-	        require => Group['backupninjas'],
+                require => Group['backupninjas'],
                 tag => "$real_backuptag"
               }
             }
-- 
cgit v1.2.3


From ead754fe1a36cafa88d5251f9561bec44d5aac1f Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 5 Jun 2010 15:12:30 -0300
Subject: Using namevars to deal with multiple backup destinations

---
 manifests/server.pp | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index b6d16b1..382764b 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -105,31 +105,34 @@ class backupninja::server {
       nagios2::passive_service { "backups-${name}": nagios2_host_name => $real_host, nagios2_description => $real_nagios2_description, servicegroups => "backups" }
     }
     
-    if !defined(File["$real_dir"]) {
-      @@file { "$real_dir":
+    if !defined(File["$real_backuptag-$real_dir"]) {
+      @@file { "$real_backuptag-$real_dir":
+        path   => "$real_dir",
         ensure => directory,
-        mode => 0750, owner => $real_user, group => 0,
-        tag => "$real_backuptag",
+        mode   => 0750, owner => $real_user, group => 0,
+        tag    => "$real_backuptag",
       }
     }
     case $installuser {
       true: {
         case $manage_ssh_dir {
           true: {
-            if !defined(File["$real_ssh_dir"]) {
-              @@file { "${real_ssh_dir}":
-                ensure => directory,
-                mode => 0700, owner => $real_user, group => 0,
+            if !defined(File["$real_backuptag-$real_ssh_dir"]) {
+              @@file { "$real_backuptag-${real_ssh_dir}":
+                path    => "${real_ssh_dir}",
+                ensure  => directory,
+                mode    => 0700, owner => $real_user, group => 0,
                 require => [User[$real_user], File["$real_dir"]],
-                tag => "$real_backuptag",
+                tag     => "$real_backuptag",
               }
             }
           }
         } 
 	case $key {
 	  false: {
-            if !defined(File["${real_ssh_dir}/${real_authorized_keys_file}"]) {
-              @@file { "${real_ssh_dir}/${real_authorized_keys_file}":
+            if !defined(File["$real_backuptag-${real_ssh_dir}/${real_authorized_keys_file}"]) {
+              @@file { "$real_backuptag-${real_ssh_dir}/${real_authorized_keys_file}":
+                path   => "${real_ssh_dir}/${real_authorized_keys_file",
                 ensure => present,
                 mode => 0644, owner => 0, group => 0,
                 source => "$real_backupkeys/${real_user}_id_${keytype}.pub",
@@ -139,8 +142,9 @@ class backupninja::server {
             }
 	  }
 	  default: {
-              if !defined(Ssh_autorized_key["$real_user"]) {
-                @@ssh_authorized_key{ "$real_user":
+              if !defined(Ssh_autorized_key["$real_backuptag-$real_user"]) {
+                @@ssh_authorized_key{ "$real_backuptag-$real_user":
+                  name    => "$real_user",
                   type    => $keytype,
                   key     => $key,
                   user    => $real_user,
@@ -153,8 +157,9 @@ class backupninja::server {
 	}
         case $uid {
           false: {
-            if !defined(User["$real_user"]) {
-              @@user { "$real_user":
+            if !defined(User["$real_backuptag-$real_user"]) {
+              @@user { "$real_backuptag-$real_user":
+                name    => "$real_user",
                 ensure  => "present",
                 gid     => "$gid",
                 comment => "$name backup sandbox",
@@ -168,8 +173,9 @@ class backupninja::server {
             }
           }
           default: {
-            if !defined(User["$real_user"]) {
-              @@user { "$real_user":
+            if !defined(User["$real_backuptag-$real_user"]) {
+              @@user { "$real_backuptag-$real_user":
+                name    => "$real_user",
                 ensure  => "present",
                 uid     => "$uid",
                 gid     => "$gid",
-- 
cgit v1.2.3


From 84bf61e693eceecefb9aa3dcf3a3da44cef4a2a2 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 5 Jun 2010 16:08:44 -0300
Subject: Reverting last change and trying exported resources override instead

---
 manifests/server.pp | 70 +++++++++++++++++++++++++++++++++++------------------
 1 file changed, 47 insertions(+), 23 deletions(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index 382764b..157827a 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -105,34 +105,41 @@ class backupninja::server {
       nagios2::passive_service { "backups-${name}": nagios2_host_name => $real_host, nagios2_description => $real_nagios2_description, servicegroups => "backups" }
     }
     
-    if !defined(File["$real_backuptag-$real_dir"]) {
-      @@file { "$real_backuptag-$real_dir":
-        path   => "$real_dir",
+    if !defined(File["$real_dir"]) {
+      @@file { "$real_dir":
         ensure => directory,
-        mode   => 0750, owner => $real_user, group => 0,
-        tag    => "$real_backuptag",
+        mode => 0750, owner => $real_user, group => 0,
+        tag => "$real_backuptag",
+      }
+    }
+    else {
+      File <| title == "$real_dir" |> {
+        tag +> "$real_backuptag",
       }
     }
     case $installuser {
       true: {
         case $manage_ssh_dir {
           true: {
-            if !defined(File["$real_backuptag-$real_ssh_dir"]) {
-              @@file { "$real_backuptag-${real_ssh_dir}":
-                path    => "${real_ssh_dir}",
-                ensure  => directory,
-                mode    => 0700, owner => $real_user, group => 0,
+            if !defined(File["$real_ssh_dir"]) {
+              @@file { "${real_ssh_dir}":
+                ensure => directory,
+                mode => 0700, owner => $real_user, group => 0,
                 require => [User[$real_user], File["$real_dir"]],
-                tag     => "$real_backuptag",
+                tag => "$real_backuptag",
+              }
+            }
+            else {
+              File <| title == "$real_ssh_dir" |> {
+                tag +> "$real_backuptag",
               }
             }
           }
         } 
 	case $key {
 	  false: {
-            if !defined(File["$real_backuptag-${real_ssh_dir}/${real_authorized_keys_file}"]) {
-              @@file { "$real_backuptag-${real_ssh_dir}/${real_authorized_keys_file}":
-                path   => "${real_ssh_dir}/${real_authorized_keys_file",
+            if !defined(File["${real_ssh_dir}/${real_authorized_keys_file}"]) {
+              @@file { "${real_ssh_dir}/${real_authorized_keys_file}":
                 ensure => present,
                 mode => 0644, owner => 0, group => 0,
                 source => "$real_backupkeys/${real_user}_id_${keytype}.pub",
@@ -140,11 +147,15 @@ class backupninja::server {
                 tag => "$real_backuptag",
               }
             }
+            else {
+              File <| title == "${real_ssh_dir}/${real_authorized_keys_file}" |> {
+                tag +> "$real_backuptag",
+              }
+            }
 	  }
 	  default: {
-              if !defined(Ssh_autorized_key["$real_backuptag-$real_user"]) {
-                @@ssh_authorized_key{ "$real_backuptag-$real_user":
-                  name    => "$real_user",
+              if !defined(Ssh_autorized_key["$real_user"]) {
+                @@ssh_authorized_key{ "$real_user":
                   type    => $keytype,
                   key     => $key,
                   user    => $real_user,
@@ -153,13 +164,17 @@ class backupninja::server {
                   require => User[$real_user],
                 }
               }
+              else {
+               Ssh_authorized_key <| title == "$real_user" |> {
+                  tag +> "$real_backuptag",
+                }
+              }
      }
 	}
         case $uid {
           false: {
-            if !defined(User["$real_backuptag-$real_user"]) {
-              @@user { "$real_backuptag-$real_user":
-                name    => "$real_user",
+            if !defined(User["$real_user"]) {
+              @@user { "$real_user":
                 ensure  => "present",
                 gid     => "$gid",
                 comment => "$name backup sandbox",
@@ -171,11 +186,15 @@ class backupninja::server {
                 tag => "$real_backuptag"
               }
             }
+            else {
+              User <| title == "$real_user" |> {
+                tag +> "$real_backuptag",
+              }
+            }
           }
           default: {
-            if !defined(User["$real_backuptag-$real_user"]) {
-              @@user { "$real_backuptag-$real_user":
-                name    => "$real_user",
+            if !defined(User["$real_user"]) {
+              @@user { "$real_user":
                 ensure  => "present",
                 uid     => "$uid",
                 gid     => "$gid",
@@ -188,6 +207,11 @@ class backupninja::server {
                 tag => "$real_backuptag"
               }
             }
+            else {
+              User <| title == "$real_user" |> {
+                tag +> "$real_backuptag",
+              }
+            }
           }
         }
       }
-- 
cgit v1.2.3


From b17704f7cd7897d100d4ebcf6f068858d626e4a5 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 5 Jun 2010 16:16:54 -0300
Subject: Trying another method to override an exported resource if already
 defined

---
 manifests/server.pp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index 157827a..ea7d327 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -113,7 +113,7 @@ class backupninja::server {
       }
     }
     else {
-      File <| title == "$real_dir" |> {
+      File["$real_dir"] {
         tag +> "$real_backuptag",
       }
     }
@@ -130,7 +130,7 @@ class backupninja::server {
               }
             }
             else {
-              File <| title == "$real_ssh_dir" |> {
+              File["$real_ssh_dir"] {
                 tag +> "$real_backuptag",
               }
             }
@@ -148,7 +148,7 @@ class backupninja::server {
               }
             }
             else {
-              File <| title == "${real_ssh_dir}/${real_authorized_keys_file}" |> {
+              File["${real_ssh_dir}/${real_authorized_keys_file}"] {
                 tag +> "$real_backuptag",
               }
             }
@@ -165,7 +165,7 @@ class backupninja::server {
                 }
               }
               else {
-               Ssh_authorized_key <| title == "$real_user" |> {
+               Ssh_authorized_key["$real_user"] {
                   tag +> "$real_backuptag",
                 }
               }
@@ -187,7 +187,7 @@ class backupninja::server {
               }
             }
             else {
-              User <| title == "$real_user" |> {
+              User["$real_user"] {
                 tag +> "$real_backuptag",
               }
             }
@@ -208,7 +208,7 @@ class backupninja::server {
               }
             }
             else {
-              User <| title == "$real_user" |> {
+              User["$real_user"] {
                 tag +> "$real_backuptag",
               }
             }
-- 
cgit v1.2.3


From e188dd8faa0e3b5cf033abf2e5eab000c06dc889 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 5 Jun 2010 16:49:46 -0300
Subject: Trying a different approach to realize exported resources

---
 manifests/server.pp | 48 ++++++++++++++----------------------------------
 1 file changed, 14 insertions(+), 34 deletions(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index ea7d327..40e9004 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -1,3 +1,9 @@
+define backupninja_server_realize($host) {
+  User               <<| tag == "backupninja-$host" |>>
+  File               <<| tag == "backupninja-$host" |>>
+  Ssh_authorized_key <<| tag == "backupninja-$host" |>>
+}
+
 class backupninja::server {
 
   $real_backupdir = $backupdir ? {
@@ -46,9 +52,8 @@ class backupninja::server {
     }
   }
 
-  User <<| tag == "backupninja-$real_backupserver_tag" |>>
-  File <<| tag == "backupninja-$real_backupserver_tag" |>>
-  Ssh_authorized_key <<| tag == "backupninja-$real_backupserver_tag" |>>
+  # collect all resources from hosted backups
+  Backupninja_server_realize <| tag == "$real_backupserver_tag" |>
 
   if !defined(Package["rsync"]) {
     if $rsync_ensure_version == '' { $rsync_ensure_version = 'installed' }
@@ -91,7 +96,7 @@ class backupninja::server {
       default => $authorized_keys_file,
     }
     $real_backuptag = $backuptag ? {
-      false => "backupninja-$real_host",
+      false => "backupninja-$fqdn",
       default => $backuptag,
     }
 
@@ -105,6 +110,11 @@ class backupninja::server {
       nagios2::passive_service { "backups-${name}": nagios2_host_name => $real_host, nagios2_description => $real_nagios2_description, servicegroups => "backups" }
     }
     
+    @@backupninja_server_realize { "${fqdn}-${real_host}":
+      host => $fqdn,
+      tag  => $real_host,
+    }
+
     if !defined(File["$real_dir"]) {
       @@file { "$real_dir":
         ensure => directory,
@@ -112,11 +122,6 @@ class backupninja::server {
         tag => "$real_backuptag",
       }
     }
-    else {
-      File["$real_dir"] {
-        tag +> "$real_backuptag",
-      }
-    }
     case $installuser {
       true: {
         case $manage_ssh_dir {
@@ -129,11 +134,6 @@ class backupninja::server {
                 tag => "$real_backuptag",
               }
             }
-            else {
-              File["$real_ssh_dir"] {
-                tag +> "$real_backuptag",
-              }
-            }
           }
         } 
 	case $key {
@@ -147,11 +147,6 @@ class backupninja::server {
                 tag => "$real_backuptag",
               }
             }
-            else {
-              File["${real_ssh_dir}/${real_authorized_keys_file}"] {
-                tag +> "$real_backuptag",
-              }
-            }
 	  }
 	  default: {
               if !defined(Ssh_autorized_key["$real_user"]) {
@@ -164,11 +159,6 @@ class backupninja::server {
                   require => User[$real_user],
                 }
               }
-              else {
-               Ssh_authorized_key["$real_user"] {
-                  tag +> "$real_backuptag",
-                }
-              }
      }
 	}
         case $uid {
@@ -186,11 +176,6 @@ class backupninja::server {
                 tag => "$real_backuptag"
               }
             }
-            else {
-              User["$real_user"] {
-                tag +> "$real_backuptag",
-              }
-            }
           }
           default: {
             if !defined(User["$real_user"]) {
@@ -207,11 +192,6 @@ class backupninja::server {
                 tag => "$real_backuptag"
               }
             }
-            else {
-              User["$real_user"] {
-                tag +> "$real_backuptag",
-              }
-            }
           }
         }
       }
-- 
cgit v1.2.3


From c0e70d61d406b4e8325d9cd8f5b2336b46d48b8c Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 5 Jun 2010 17:11:52 -0300
Subject: Checking for backupninja_server_realize definition / comments

---
 manifests/server.pp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index 40e9004..962c416 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -1,3 +1,4 @@
+# this define realizes all needed resources for a hosted backup
 define backupninja_server_realize($host) {
   User               <<| tag == "backupninja-$host" |>>
   File               <<| tag == "backupninja-$host" |>>
@@ -110,9 +111,12 @@ class backupninja::server {
       nagios2::passive_service { "backups-${name}": nagios2_host_name => $real_host, nagios2_description => $real_nagios2_description, servicegroups => "backups" }
     }
     
-    @@backupninja_server_realize { "${fqdn}-${real_host}":
-      host => $fqdn,
-      tag  => $real_host,
+    if !defined(Backupninja_server_realize["${fqdn}-${real_host}"]) {
+      # this defines just maps that $real_host host backups for $fdqn
+      @@backupninja_server_realize { "${fqdn}-${real_host}":
+        host => $fqdn,
+        tag  => $real_host,
+      }
     }
 
     if !defined(File["$real_dir"]) {
-- 
cgit v1.2.3


From d6f5ad38919445bc5e611389f83ac7e2335ec9dc Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 5 Jun 2010 17:33:26 -0300
Subject: Testing without checking duplicate definition of
 backupninja_server_realize

---
 manifests/server.pp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index 962c416..3ef97ce 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -111,12 +111,10 @@ class backupninja::server {
       nagios2::passive_service { "backups-${name}": nagios2_host_name => $real_host, nagios2_description => $real_nagios2_description, servicegroups => "backups" }
     }
     
-    if !defined(Backupninja_server_realize["${fqdn}-${real_host}"]) {
-      # this defines just maps that $real_host host backups for $fdqn
-      @@backupninja_server_realize { "${fqdn}-${real_host}":
-        host => $fqdn,
-        tag  => $real_host,
-      }
+    # this defines just maps that $real_host host backups for $fdqn
+    @@backupninja_server_realize { "${fqdn}@${real_host}":
+      host => $fqdn,
+      tag  => $real_host,
     }
 
     if !defined(File["$real_dir"]) {
-- 
cgit v1.2.3


From e736c22f347c572eae79568a6d0cdde996207496 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 5 Jun 2010 17:40:37 -0300
Subject: Adding back duplicate definition check for backupninja_server_realize

---
 manifests/server.pp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index 3ef97ce..8337bcc 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -111,10 +111,12 @@ class backupninja::server {
       nagios2::passive_service { "backups-${name}": nagios2_host_name => $real_host, nagios2_description => $real_nagios2_description, servicegroups => "backups" }
     }
     
-    # this defines just maps that $real_host host backups for $fdqn
-    @@backupninja_server_realize { "${fqdn}@${real_host}":
-      host => $fqdn,
-      tag  => $real_host,
+    if !defined(Backupninja_server_realize["${fqdn}@${real_host}"]) {
+      # this defines just maps that $real_host host backups for $fdqn
+      @@backupninja_server_realize { "${fqdn}@${real_host}":
+        host => $fqdn,
+        tag  => $real_host,
+      }
     }
 
     if !defined(File["$real_dir"]) {
-- 
cgit v1.2.3


From 85c8fbe374670ebc615f42e7eec4e1c52258fcf2 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 5 Jun 2010 18:38:12 -0300
Subject: Minor fix at Backupninja_server_realize realization

---
 manifests/server.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index 8337bcc..46eadc8 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -54,7 +54,7 @@ class backupninja::server {
   }
 
   # collect all resources from hosted backups
-  Backupninja_server_realize <| tag == "$real_backupserver_tag" |>
+  Backupninja_server_realize <<| tag == "$real_backupserver_tag" |>>
 
   if !defined(Package["rsync"]) {
     if $rsync_ensure_version == '' { $rsync_ensure_version = 'installed' }
-- 
cgit v1.2.3


From 7f3356e33789703c9ebcd8b1477e5c0d0b2b3feb Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 7 Jun 2010 23:55:42 -0300
Subject: Fixing user comments

---
 manifests/server.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index 46eadc8..3114b92 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -171,7 +171,7 @@ class backupninja::server {
               @@user { "$real_user":
                 ensure  => "present",
                 gid     => "$gid",
-                comment => "$name backup sandbox",
+                comment => "$real_user backup sandbox",
                 home    => "$real_dir",
                 managehome => true,
                 shell   => "/bin/sh",
@@ -187,7 +187,7 @@ class backupninja::server {
                 ensure  => "present",
                 uid     => "$uid",
                 gid     => "$gid",
-                comment => "$name backup sandbox",
+                comment => "$real_user backup sandbox",
                 home    => "$real_dir",
                 managehome => true,
                 shell   => "/bin/sh",
-- 
cgit v1.2.3


From 3815377799754d09f5ca28efdda8b78d9d3e2aa4 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 15 May 2012 11:33:38 -0300
Subject: Force bash at remote destination (backupninja upstream #3003)

---
 manifests/server.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index 3114b92..b01c042 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -174,7 +174,7 @@ class backupninja::server {
                 comment => "$real_user backup sandbox",
                 home    => "$real_dir",
                 managehome => true,
-                shell   => "/bin/sh",
+                shell   => "/bin/bash",
                 password => '*',
                 require => Group['backupninjas'],
                 tag => "$real_backuptag"
@@ -190,7 +190,7 @@ class backupninja::server {
                 comment => "$real_user backup sandbox",
                 home    => "$real_dir",
                 managehome => true,
-                shell   => "/bin/sh",
+                shell   => "/bin/bash",
                 password => '*',
                 require => Group['backupninjas'],
                 tag => "$real_backuptag"
-- 
cgit v1.2.3


From 1cb8f09877a7e1bf2ef3a2cd35d846ab2ffeec7b Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 6 Mar 2014 17:12:15 -0300
Subject: Support for '' variable

---
 manifests/server.pp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index b01c042..417b3e6 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -19,6 +19,10 @@ class backupninja::server {
     '' => $fqdn,
     default => $backupserver_tag
   }
+  $real_backupdir_ensure = $backupdir_ensure ? {
+    '' => "directory",
+    default => $backupdir_ensure,
+  }
   
   group { "backupninjas":
     ensure => "present",
-- 
cgit v1.2.3


From 62f3b81b71f8a06c873729dc322bfa931518cc90 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 6 Mar 2014 17:12:46 -0300
Subject: Support for '' variable (2)

---
 manifests/server.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index 417b3e6..2cc11cc 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -30,7 +30,7 @@ class backupninja::server {
   }
   
   file { "$real_backupdir":
-    ensure => "directory",
+    ensure => "$real_backupdir_ensure",
     mode => 0710, owner => root, group => "backupninjas"
   }
 
-- 
cgit v1.2.3


From d6580414a08c20d6b29f7fd5d81692247f0ad8ca Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 6 Mar 2014 17:18:33 -0300
Subject: Support for '' variable (3)

---
 manifests/server.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index 2cc11cc..66edb34 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -32,6 +32,7 @@ class backupninja::server {
   file { "$real_backupdir":
     ensure => "$real_backupdir_ensure",
     mode => 0710, owner => root, group => "backupninjas"
+    require => File["$real_backupdir_ensure"],
   }
 
   if $nagios_server {
-- 
cgit v1.2.3


From 2a82c6c7bc547ba6046f651a8abc2b4b038a28c1 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 6 Mar 2014 17:40:48 -0300
Subject: Support for backupdir_ensure variable (4)

---
 manifests/server.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index 66edb34..8a0f5e5 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -31,7 +31,7 @@ class backupninja::server {
   
   file { "$real_backupdir":
     ensure => "$real_backupdir_ensure",
-    mode => 0710, owner => root, group => "backupninjas"
+    mode => 0710, owner => root, group => "backupninjas",
     require => File["$real_backupdir_ensure"],
   }
 
-- 
cgit v1.2.3


From b8a4f91cf2c6292d52fb9a8372292cc5a142b92d Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 6 Mar 2014 21:45:01 -0300
Subject: Support for backupdir_ensure variable (5)

---
 manifests/server.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index 8a0f5e5..6ed87c8 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -32,7 +32,10 @@ class backupninja::server {
   file { "$real_backupdir":
     ensure => "$real_backupdir_ensure",
     mode => 0710, owner => root, group => "backupninjas",
-    require => File["$real_backupdir_ensure"],
+    require => $real_backupdir_ensure ? {
+      'directory' => undef,
+      default     => File["$real_backupdir_ensure"],
+    }
   }
 
   if $nagios_server {
-- 
cgit v1.2.3