I unset the duplicity options that are set by default by backupninja

already (it is unecessary to set them when they are already set to the
defaults): testconnect, sign, keep, bandwidthlimit

I also unset because they were not set to the defaults: $tmpdir =
"/var/tmp/duplicity", $nicelevel = 19. The defaults for these are:
$tmpdir = "/tmp", and $nicelevel = 0. The example configuration files
included in backupninja are confusing about these, so I've just
clarified those in the upstream source.

Then there were a couple options that were set to values that I think
should not be set: $password = "a_very_complicated_passphrase" -- I
dont think this should be set by default at all, because people will
accidentally use this passphrase by default (yuck). People should be
forced to set this. I also reset the $destdir = "/backups" setting to
be false. This value must be set, but I dont think it should be set by
default.

diff --git a/manifests/dup.pp b/manifests/dup.pp
index 26514ad03b8a7dbb0c7f8caba38915e946777d90..afcdab253c9ed6f4457752d5fefbbfd39f260398 100644 (file)
--- a/manifests/dup.pp
+++ b/manifests/dup.pp
@@ -37,14 +37,14 @@ define backupninja::duplicity( $order  = 90,
                                $ensure = present,
                                # options to the config file
                                $options     = false,
-                               $nicelevel   = 0,
-                               $testconnect = "yes",
-                               $tmpdir      = "/var/tmp/duplicity",
+                               $nicelevel   = false,
+                               $testconnect = false,
+                               $tmpdir      = false,
                                # [gpg]
-                               $sign       = "no",
+                               $sign       = false,
                                $encryptkey = false,
                                $signkey    = false,
-                               $password   = "a_very_complicated_passphrase",
+                               $password   = false,
                                # [source]
                                $include = [ "/var/spool/cron/crontabs",
                                             "/var/backups",
@@ -67,10 +67,10 @@ define backupninja::duplicity( $order  = 90,
                                $vsinclude = false,
                                # [dest]
                                $incremental   = "yes",
-                               $keep          = 60,
-                               $bandwithlimit = "0",
+                               $keep          = false,
+                               $bandwithlimit = false,
                                $sshoptions    = false,
-                               $destdir       = "/backups",
+                               $destdir       = false,
                                $desthost      = false,
                                $destuser      = false,
                                # configs to backupninja client