From c80b8348d7b3befb9cff496bb0443a0d05385b26 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 26 Aug 2009 21:07:40 -0300
Subject: Add rdiff::backup option to config dest user home folder

---
 manifests/rdiff.pp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index e3964d0..ec89006 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -25,7 +25,7 @@ define backupninja::rdiff(
                "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
   $vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $ssh_dir_manage = true,
   $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true,
-  $backuptag = false)
+  $backuptag = false, $home = false)
 {
   include backupninja::client
   case $type {
@@ -34,7 +34,11 @@ define backupninja::rdiff(
       
       backupninja::server::sandbox
       {
-        "${user}-${name}": user => $user, host => $host, dir => $directory,
+        $real_home = $home ? {
+          false => $directory,
+          default => $home,
+        }
+        "${user}-${name}": user => $user, host => $host, dir => $real_home,
         manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir,
         authorized_keys_file => $authorized_keys_file, installuser => $installuser,
         backuptag => $backuptag
-- 
cgit v1.2.3


From e0982845a5781c542ac3efa3b8c7d6b7f7db8087 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 26 Aug 2009 21:14:07 -0300
Subject: Oops

---
 manifests/rdiff.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index ec89006..b1dd7d2 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -32,12 +32,13 @@ define backupninja::rdiff(
     'remote': {
       case $host { false: { err("need to define a host for remote backups!") } }
       
+      $real_home = $home ? {
+        false => $directory,
+        default => $home,
+      }
+
       backupninja::server::sandbox
       {
-        $real_home = $home ? {
-          false => $directory,
-          default => $home,
-        }
         "${user}-${name}": user => $user, host => $host, dir => $real_home,
         manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir,
         authorized_keys_file => $authorized_keys_file, installuser => $installuser,
-- 
cgit v1.2.3


From 564244547ab684e9b63d48fcabbe4f6d377d022e Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 26 Aug 2009 22:29:24 -0300
Subject: Adding backupkeytype parameter at backupninja::rdiff

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

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index b1dd7d2..a8956f3 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -25,7 +25,7 @@ define backupninja::rdiff(
                "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
   $vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $ssh_dir_manage = true,
   $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true,
-  $backuptag = false, $home = false)
+  $backuptag = false, $home = false, $backupkeytype = false)
 {
   include backupninja::client
   case $type {
@@ -42,7 +42,7 @@ define backupninja::rdiff(
         "${user}-${name}": user => $user, host => $host, dir => $real_home,
         manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir,
         authorized_keys_file => $authorized_keys_file, installuser => $installuser,
-        backuptag => $backuptag
+        backuptag => $backuptag, keytype => $backupkeytype,
       }
       
       backupninja::client::key
-- 
cgit v1.2.3


From 618cddaaeb0a89d3f01f359ebcb80be9d95264da Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 26 Aug 2009 22:40:24 -0300
Subject: Setting the right default value for backupkeytype

---
 manifests/dup.pp   | 2 +-
 manifests/rdiff.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/dup.pp b/manifests/dup.pp
index 05d4892..f12fc0f 100644
--- a/manifests/dup.pp
+++ b/manifests/dup.pp
@@ -75,7 +75,7 @@ define backupninja::duplicity( $order  = 90,
                                $destuser      = false,
                                # configs to backupninja client
                                $backupkeystore       = false,
-                               $backupkeytype        = false,
+                               $backupkeytype        = '',
                                # options to backupninja server sandbox
                                $ssh_dir_manage       = true,
                                $ssh_dir              = false,
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index a8956f3..579071b 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -25,7 +25,7 @@ define backupninja::rdiff(
                "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
   $vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $ssh_dir_manage = true,
   $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true,
-  $backuptag = false, $home = false, $backupkeytype = false)
+  $backuptag = false, $home = false, $backupkeytype = '')
 {
   include backupninja::client
   case $type {
-- 
cgit v1.2.3


From d162c8429284b2dd18f90c23095935b35cc0106c Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 27 Aug 2009 13:20:38 -0300
Subject: Trying to avoid duplicate definition of backupninja::client::key on
 backupninja::rdiff

---
 manifests/rdiff.pp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 579071b..2eb1d9b 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -44,11 +44,13 @@ define backupninja::rdiff(
         authorized_keys_file => $authorized_keys_file, installuser => $installuser,
         backuptag => $backuptag, keytype => $backupkeytype,
       }
-      
-      backupninja::client::key
-      {
-        "${user}-${name}": user => $user, host => $host,
-        installkey => $installkey
+     
+      if !defined(Backupninja::client::key["${user}-${name}"]) {
+        backupninja::client::key
+        {
+          "${user}-${name}": user => $user, host => $host,
+          installkey => $installkey
+        }
       }
     }
   }
-- 
cgit v1.2.3


From e8b238bf014cefd1f4077b9d96113cf0463ab3b4 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 27 Aug 2009 17:13:11 -0400
Subject: set a requirement that the rdiff-backup directory variable must be
 set

---
 manifests/rdiff.pp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index e3964d0..1207cb1 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -28,6 +28,9 @@ define backupninja::rdiff(
   $backuptag = false)
 {
   include backupninja::client
+
+  case $directory { false: { err("need to define a directory for where the backups should go!") } }
+  
   case $type {
     'remote': {
       case $host { false: { err("need to define a host for remote backups!") } }
-- 
cgit v1.2.3


From 3262942cba7b324e7c23756ef026e28053acfa95 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 27 Aug 2009 21:08:54 -0300
Subject: Removing wrong defined() call

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

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index d34fc88..55aa382 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -48,12 +48,10 @@ define backupninja::rdiff(
         backuptag => $backuptag, keytype => $backupkeytype,
       }
      
-      if !defined(Backupninja::client::key["${user}-${name}"]) {
-        backupninja::client::key
-        {
-          "${user}-${name}": user => $user, host => $host,
-          installkey => $installkey
-        }
+      backupninja::client::key
+      {
+        "${user}-${name}": user => $user, host => $host,
+        installkey => $installkey
       }
     }
   }
-- 
cgit v1.2.3


From 51fa752d2f4f8e68c933483c8c772181de96f4bf Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 27 Aug 2009 21:16:45 -0300
Subject: Making backupkeytype = false by default to avoided blank keytype

---
 manifests/dup.pp   | 2 +-
 manifests/rdiff.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/dup.pp b/manifests/dup.pp
index 5e58c2b..c4554ee 100644
--- a/manifests/dup.pp
+++ b/manifests/dup.pp
@@ -79,7 +79,7 @@ define backupninja::duplicity( $order  = 90,
                                $destuser      = false,
                                # configs to backupninja client
                                $backupkeystore       = false,
-                               $backupkeytype        = '',
+                               $backupkeytype        = false,
                                # options to backupninja server sandbox
                                $ssh_dir_manage       = true,
                                $ssh_dir              = false,
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 55aa382..9348b42 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -25,7 +25,7 @@ define backupninja::rdiff(
                "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
   $vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $ssh_dir_manage = true,
   $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true,
-  $backuptag = false, $home = false, $backupkeytype = '')
+  $backuptag = false, $home = false, $backupkeytype = false)
 {
   include backupninja::client
 
-- 
cgit v1.2.3


From f96267fe354a9df417afdc09899c58edf3e67d24 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 27 Aug 2009 22:08:50 -0300
Subject: Defaulting backupkeytype to 'rsa'

---
 manifests/dup.pp   | 2 +-
 manifests/rdiff.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/dup.pp b/manifests/dup.pp
index c4554ee..411a44d 100644
--- a/manifests/dup.pp
+++ b/manifests/dup.pp
@@ -79,7 +79,7 @@ define backupninja::duplicity( $order  = 90,
                                $destuser      = false,
                                # configs to backupninja client
                                $backupkeystore       = false,
-                               $backupkeytype        = false,
+                               $backupkeytype        = "rsa",
                                # options to backupninja server sandbox
                                $ssh_dir_manage       = true,
                                $ssh_dir              = false,
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 9348b42..904c68f 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -25,7 +25,7 @@ define backupninja::rdiff(
                "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
   $vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $ssh_dir_manage = true,
   $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true,
-  $backuptag = false, $home = false, $backupkeytype = false)
+  $backuptag = false, $home = false, $backupkeytype = "rsa")
 {
   include backupninja::client
 
-- 
cgit v1.2.3


From b432d94fa72162aa9635217b703ad100b9d39fa2 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 28 Aug 2009 17:17:25 -0300
Subject: 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.
---
 manifests/client.pp     | 33 ++++++++++++++++++---------------
 manifests/dup.pp        |  6 +++---
 manifests/labelmount.pp | 10 +++++-----
 manifests/maildir.pp    |  6 +++---
 manifests/mysql.pp      |  6 +++---
 manifests/rdiff.pp      |  6 +++---
 manifests/sh.pp         |  6 +++---
 manifests/svn.pp        |  6 +++---
 manifests/sys.pp        |  6 +++---
 9 files changed, 44 insertions(+), 41 deletions(-)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/client.pp b/manifests/client.pp
index fa64510..f8c5e23 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -1,4 +1,4 @@
-class backupninja::client {
+class backupninja::client::defaults {
   $configdir = $cfg_override ? {
     '' => "/etc/backup.d",
     default => $cfg_override,
@@ -38,6 +38,9 @@ class backupninja::client {
   file { $configdir:
     ensure => directory
   }
+}
+
+class backupninja::client inherits backupninja::client::defaults {
   define key(
     $user = false, $host = false, $installkey=false, $keyowner=false,
     $keygroup=false, $keystore=false, $keytype=false)
@@ -51,40 +54,40 @@ class backupninja::client {
       default => $host
     }
     $install_key = $installkey ? {
-    	false => "${backupninja::client::real_keymanage}",
+    	false => "${backupninja::client::defaults::real_keymanage}",
 	default => $installkey,
     }
     $key_owner = $keyowner ? {
-    	false => "${backupninja::client::real_keyowner}",
+    	false => "${backupninja::client::defaults::real_keyowner}",
 	default => $keyowner,
     }
     $key_group = $keygroup ? {
-    	false => "${backupninja::client::real_keygroup}",
+    	false => "${backupninja::client::defaults::real_keygroup}",
 	default => $keygroup,
     }
     $key_store = $keystore ? {
-    	false => "${backupninja::client::real_keystore}",
+    	false => "${backupninja::client::defaults::real_keystore}",
 	default => $keystore,
     }
     $key_type = $keytype ? {
-    	''    => "${backupninja::client::real_keytype}",
-    	false => "${backupninja::client::real_keytype}",
+    	''    => "${backupninja::client::defaults::real_keytype}",
+    	false => "${backupninja::client::defaults::real_keytype}",
 	default => $keytype,
     }
 
     case $install_key {
       true: {
-        if !defined(File["${backupninja::client::real_keydestination}"]) {
-          file { "${backupninja::client::real_keydestination}":
+        if !defined(File["${backupninja::client::defaults::real_keydestination}"]) {
+          file { "${backupninja::client::defaults::real_keydestination}":
             ensure => directory,
             mode => 0700, owner => $key_owner, group => $key_group,
           }
         }
-        if !defined(File["${backupninja::client::real_keydestination/id_${key_type}"]) {
-          file { "${backupninja::client::real_keydestination}/id_${key_type}":
+        if !defined(File["${backupninja::client::defaults::real_keydestination/id_${key_type}"]) {
+          file { "${backupninja::client::defaults::real_keydestination}/id_${key_type}":
             source => "${key_store}/${real_user}_id_${key_type}",
             mode => 0400, owner => $key_owner, group => $key_group,
-            require => File["${backupninja::client::real_keydestination}"],
+            require => File["${backupninja::client::defaults::real_keydestination}"],
           }
         }
       }
@@ -92,7 +95,7 @@ class backupninja::client {
   }
 }
 
-class backupninja::client::maildir inherits backupninja::client {
+class backupninja::client::maildir inherits backupninja::client::defaults {
 
   if !defined(Package["rsync"]) {
     if $rsync_ensure_version == '' { $rsync_ensure_version = 'installed' }
@@ -102,7 +105,7 @@ class backupninja::client::maildir inherits backupninja::client {
   } 
 }
 
-class backupninja::client::rdiff_backup inherits backupninja::client {
+class backupninja::client::rdiff_backup inherits backupninja::client::defaults {
 
   if !defined(Package["rdiff-backup"]) {
     if $rdiff_backup_ensure_version == '' { $rdiff_backup_ensure_version = 'installed' }
@@ -112,7 +115,7 @@ class backupninja::client::rdiff_backup inherits backupninja::client {
   }
 }
 
-class backupninja::client::duplicity inherits backupninja::client {
+class backupninja::client::duplicity inherits backupninja::client::defaults {
 
   if !defined(Package["duplicity"]) {
     if $duplicity_ensure_version == '' { $duplicity_ensure_version = 'installed' }
diff --git a/manifests/dup.pp b/manifests/dup.pp
index 411a44d..6e0330a 100644
--- a/manifests/dup.pp
+++ b/manifests/dup.pp
@@ -90,7 +90,7 @@ define backupninja::duplicity( $order  = 90,
                                $installkey           = true ) {
 
   # the client with configs for this machine
-  include backupninja::client
+  include backupninja::client::defaults
 
   case $desthost { false: { err("need to define a destination host for remote backups!") } }
   case $destdir { false: { err("need to define a destination directory for remote backups!") } }
@@ -119,13 +119,13 @@ define backupninja::duplicity( $order  = 90,
   }
 
   # the backupninja rule for this duplicity backup
-  file { "${backupninja::client::configdir}/${order}_${name}.dup":
+  file { "${backupninja::client::defaults::configdir}/${order}_${name}.dup":
     ensure  => $ensure,
     content => template('backupninja/dup.conf.erb'),
     owner   => root,
     group   => root,
     mode    => 0600,
-    require => File["${backupninja::client::configdir}"]
+    require => File["${backupninja::client::defaults::configdir}"]
   }
 }
   
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
diff --git a/manifests/maildir.pp b/manifests/maildir.pp
index 8444a9e..d871654 100644
--- a/manifests/maildir.pp
+++ b/manifests/maildir.pp
@@ -22,7 +22,7 @@ define backupninja::maildir(
   $remove = false, $multiconnection = yes, $keepdaily='4', $keepweekly='2',
   $keepmonthly='2')
 {
-  include backupninja::client
+  include backupninja::client::defaults
                           
   case $srcdir { false: { err("need to define a source directory to backup!") } }
   case $destdir { false: { err("need to define a destination directory to backup!") } }
@@ -30,12 +30,12 @@ define backupninja::maildir(
   case $destuser { false: { err("need to define a destination user for backups!") } }
   case $destid_file { false: { err("need to define a ssh key id file to use!") } }
   
-  file { "${backupninja::client::configdir}/${order}_${name}.maildir":
+  file { "${backupninja::client::defaults::configdir}/${order}_${name}.maildir":
     ensure => $ensure,
     content => template('backupninja/maildir.conf.erb'),
     owner => root,
     group => root,
     mode => 0600,
-    require => File["${backupninja::client::configdir}"]
+    require => File["${backupninja::client::defaults::configdir}"]
   }
 }
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index e7c0eb4..e6cfe90 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -20,13 +20,13 @@ define backupninja::mysql(
   $sqldump = false, $compress = false, $configfile = '/etc/mysql/debian.cnf',
   $vsname = false)
 {
-  include backupninja::client
-  file { "${backupninja::client::configdir}/${order}_${name}.mysql":
+  include backupninja::client::defaults
+  file { "${backupninja::client::defaults::configdir}/${order}_${name}.mysql":
     ensure => $ensure,
     content => template('backupninja/mysql.conf.erb'),
     owner => root,
     group => root,
     mode => 0600,
-    require => File["${backupninja::client::configdir}"]
+    require => File["${backupninja::client::defaults::configdir}"]
   }
 }
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 904c68f..9f81d8f 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -27,7 +27,7 @@ define backupninja::rdiff(
   $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true,
   $backuptag = false, $home = false, $backupkeytype = "rsa")
 {
-  include backupninja::client
+  include backupninja::client::defaults
 
   case $directory { false: { err("need to define a directory for where the backups should go!") } }
   
@@ -55,13 +55,13 @@ define backupninja::rdiff(
       }
     }
   }
-  file { "${backupninja::client::configdir}/${order}_${name}.rdiff":
+  file { "${backupninja::client::defaults::configdir}/${order}_${name}.rdiff":
     ensure => $ensure,
     content => template('backupninja/rdiff.conf.erb'),
     owner => root,
     group => root,
     mode => 0600,
-    require => File["${backupninja::client::configdir}"]
+    require => File["${backupninja::client::defaults::configdir}"]
   }
 }
   
diff --git a/manifests/sh.pp b/manifests/sh.pp
index a49a3d1..fa6aca5 100644
--- a/manifests/sh.pp
+++ b/manifests/sh.pp
@@ -14,13 +14,13 @@ define backupninja::sh($order = 50,
                            $ensure = present,
                            $command_string
                           ) {
-                          include backupninja::client
-	file { "${backupninja::client::configdir}/${order}_${name}.sh":
+                          include backupninja::client::defaults
+	file { "${backupninja::client::defaults::configdir}/${order}_${name}.sh":
 		ensure => $ensure,
 		content => template('backupninja/sh.conf.erb'),
 		owner => root,
 		group => root,
 		mode => 0600,
-		require => File["${backupninja::client::configdir}"]
+		require => File["${backupninja::client::defaults::configdir}"]
 	}
 }
diff --git a/manifests/svn.pp b/manifests/svn.pp
index 903be74..3ab59c9 100644
--- a/manifests/svn.pp
+++ b/manifests/svn.pp
@@ -17,13 +17,13 @@ define backupninja::svn($order = 20,
                            $tmp = '/var/backups/svn.tmp',
                            $vsname = false
                           ) {
-                          include backupninja::client
-	file { "${backupninja::client::configdir}/${order}_${name}.svn":
+                          include backupninja::client::defaults
+	file { "${backupninja::client::defaults::configdir}/${order}_${name}.svn":
 		ensure => $ensure,
 		content => template('backupninja/svn.conf.erb'),
 		owner => root,
 		group => root,
 		mode => 0600,
-		require => File["${backupninja::client::configdir}"]
+		require => File["${backupninja::client::defaults::configdir}"]
 	}
 }
diff --git a/manifests/sys.pp b/manifests/sys.pp
index 106da9b..973f880 100644
--- a/manifests/sys.pp
+++ b/manifests/sys.pp
@@ -22,13 +22,13 @@ define backupninja::sys($order = 30,
                            $hardwarefile = '/var/backups/hardware.txt',
                            $dohwinfo = yes
                           ) {
-                          include backupninja::client
-	file { "${backupninja::client::configdir}/${order}_${name}.sys":
+                          include backupninja::client::defaults
+	file { "${backupninja::client::defaults::configdir}/${order}_${name}.sys":
 		ensure => $ensure,
 		content => template('backupninja/sys.conf.erb'),
 		owner => root,
 		group => root,
 		mode => 0600,
-		require => File["${backupninja::client::configdir}"]
+		require => File["${backupninja::client::defaults::configdir}"]
 	}
 }
-- 
cgit v1.2.3


From c823b2865bfc5ce19e91afda2572e1f66d5613e3 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 28 Aug 2009 18:27:47 -0300
Subject: Adding keytype at backupninja::client::key

---
 manifests/rdiff.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 9f81d8f..f810357 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -51,7 +51,8 @@ define backupninja::rdiff(
       backupninja::client::key
       {
         "${user}-${name}": user => $user, host => $host,
-        installkey => $installkey
+        installkey => $installkey,
+        keytype => $backupkeytype,
       }
     }
   }
-- 
cgit v1.2.3


From 70cae2f75b1938ac26a75597a8e75dc3e7d327b7 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 29 Aug 2009 13:18:54 -0300
Subject: Adding missing keystore and backupkeystore parameters at rdiff and
 dup definitions

---
 manifests/dup.pp   | 1 +
 manifests/rdiff.pp | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'manifests/rdiff.pp')

diff --git a/manifests/dup.pp b/manifests/dup.pp
index 6e0330a..dc597f7 100644
--- a/manifests/dup.pp
+++ b/manifests/dup.pp
@@ -116,6 +116,7 @@ define backupninja::duplicity( $order  = 90,
     host       => $desthost,
     installkey => $installkey,
     keytype    => $backupkeytype,
+    keystore   => $backupkeystore,
   }
 
   # the backupninja rule for this duplicity backup
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index f810357..b32a262 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -25,7 +25,7 @@ define backupninja::rdiff(
                "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
   $vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $ssh_dir_manage = true,
   $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true,
-  $backuptag = false, $home = false, $backupkeytype = "rsa")
+  $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false)
 {
   include backupninja::client::defaults
 
@@ -45,7 +45,7 @@ define backupninja::rdiff(
         "${user}-${name}": user => $user, host => $host, dir => $real_home,
         manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir,
         authorized_keys_file => $authorized_keys_file, installuser => $installuser,
-        backuptag => $backuptag, keytype => $backupkeytype,
+        backuptag => $backuptag, keytype => $backupkeytype, backupkeys => $backupkeystore,
       }
      
       backupninja::client::key
@@ -53,6 +53,7 @@ define backupninja::rdiff(
         "${user}-${name}": user => $user, host => $host,
         installkey => $installkey,
         keytype => $backupkeytype,
+        keystore => $backupkeystore,
       }
     }
   }
-- 
cgit v1.2.3