From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 1 Feb 2010 13:54:54 +0000 (-0200)
Subject: Merge branch 'master' of git://labs.riseup.net/module_backupninja
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2e95f11a809a541c0ed852c7b2057dc53f49818d;p=puppet-backupninja.git

Merge branch 'master' of git://labs.riseup.net/module_backupninja

Conflicts:
	manifests/rdiff.pp
---

2e95f11a809a541c0ed852c7b2057dc53f49818d
diff --cc manifests/rdiff.pp
index 562d652,587c02d..f750e23
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@@ -25,8 -25,7 +25,8 @@@ define backupninja::rdiff
                 "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
    $vsinclude = false, $keep = 30, $sshoptions = false, $options = '--force', $ssh_dir_manage = true,
    $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true, $key = false,
 -  $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false, $nagios2_description = 'backups')
 +  $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false,
-   $subfolder = 'rdiff-backup')
++  $nagios2_description = 'backups', $subfolder = 'rdiff-backup')
  {
    include backupninja::client::rdiff_backup