From: Micah Anderson <micah@riseup.net>
Date: Thu, 27 Aug 2009 23:47:12 +0000 (-0400)
Subject: Merge commit '6734c256525e1dd42ba3648db82083bcabca66ed'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=08d43f8c6d6a60f456cb82f2fb270f48470c96d7;p=puppet-backupninja.git

Merge commit '6734c256525e1dd42ba3648db82083bcabca66ed'

Conflicts:
	manifests/dup.pp
---

08d43f8c6d6a60f456cb82f2fb270f48470c96d7
diff --cc manifests/rdiff.pp
index 1207cb1,579071b..98a74b2
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@@ -25,12 -25,9 +25,12 @@@ 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, $backupkeytype = '')
  {
    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!") } }