fix bad upstream merge

10 files changed, 58 insertions, 27 deletions

diff --git a/AUTHORS b/AUTHORS
index 30fcc5c..be4e7e6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -34,4 +34,3 @@ Olivier Berger <oberger@ouvaton.org> -- dup debug output bugfix, reportinfo opti
 stefan <s.freudenberg@jpberlin.de> -- dup support for Amazon S3 buckets
 maniacmartin <martin@maniacmartin.com> -- rdiff confusing error message fix
 Chris Nolan <chris@cenolan.com> -- maildir subdirectory expansion
-
diff --git a/ChangeLog b/ChangeLog
index 2ae08a2..4be58ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -285,7 +285,7 @@ version 0.9.4 -- October 6th, 2006
            sshoptions (Closes: #388543)
 	 . Now forbid to (try to) include /.
 	sys:
-	 . Many more system checks were added, (thanks to Petr Klíma)
+	 . Many more system checks were added, (thanks to Petr KlĂ­ma)
 	 . Added warning if no devices were found (thanks Ranier Zocholl)
 	 . Enhanced debian package selections to include purged packages (thanks
 	   Tom Hoover)
@@ -406,7 +406,7 @@ version 0.9.2 -- December 29, 2005
 
 version 0.9.1 -- November 05 2005
     rearranged source so that it is relocatable with autotools
-        (thanks to Petr Klíma petr.klima@madeta-group.cz)
+        (thanks to Petr KlĂ­ma petr.klima@madeta-group.cz)
     fixed many bugs in rdiff helper
     rdiff handler does not require 'label' (for real this time?)
     added makecd ninjahelper
diff --git a/FAQ b/FAQ
new file mode 100644
index 0000000..16a411e
--- /dev/null
+++ b/FAQ
@@ -0,0 +1,19 @@
+Q: duplicity works fine when run standalone, but complains about gpg
+"public key not found" when run from backupninja
+
+A: We bet you're using sudo to run both duplicity and backupninja, and have been
+using sudo as well when generating the GnuPG key pair used by duplicity.
+
+Quick fix: generate a new GnuPG key pair in a root shell, or using
+"sudo -H" instead of plain sudo.
+
+Another solution: import the GnuPG keypair into the root user's keyring, taking
+care of running "gpg --update-trustdb" in a root shell or using "sudo -H"
+afterwards, in order to tag this keypair as "ultimately trusted".
+
+Detailed explanation: sudo does not change $HOME by default, so GnuPG saved the
+newly generated key pair to your own keyring, rather than to the root user's
+keyring. Running "sudo duplicity" hides the problem, as it uses your own
+keyring. Running "sudo backupninja" reveals the problem, as backupninja uses
+"su" to make sure it runs duplicity in a real root environment, i.e. using the
+root user's GnuPG keyring.
diff --git a/debian/changelog b/debian/changelog
index d22b675..1e51a47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+backupninja (0.9.7-4) experimental; urgency=low
+
+  * Fix bad upstream merge
+
+ -- Micah Anderson <micah@riseup.net>  Fri, 29 Jan 2010 17:01:27 -0500
+
 backupninja (0.9.7-3) experimental; urgency=low
 
   * Fix configure script, which was generated from previous release
diff --git a/examples/example.ldap b/examples/example.ldap
index 4dd03ea..ee7c57d 100644
--- a/examples/example.ldap
+++ b/examples/example.ldap
@@ -48,5 +48,4 @@
 
 ## tls (default yes): if set to 'yes' then TLS connection will be
 ## attempted to your ldaphost by using the URI base ldaps: otherwise ldap: will be used
-# tls = yes
-
+# tls = yes
\ No newline at end of file
diff --git a/examples/example.mysql b/examples/example.mysql
index bd996e7..de9651f 100644
--- a/examples/example.mysql
+++ b/examples/example.mysql
@@ -73,6 +73,10 @@ compress    = yes
 # make a backup using mysqldump. this creates text files with sql commands
 # sufficient to recontruct the database.
 #
+# sqldumpoptions = <options>
+# (default = --lock-tables --complete-insert --add-drop-table --quick --quote-names)
+# arguments to pass to mysqldump
+#
 # compress = < yes | no > (default = yes)
 # if yes, compress the sqldump output. 
 #
diff --git a/examples/example.sys b/examples/example.sys
index af28fd6..fe34646 100644
--- a/examples/example.sys
+++ b/examples/example.sys
@@ -1,6 +1,6 @@
 #
 # this config file will save various reports of vital system information.
-# by default, all the reports are enabled and are saved in /var/backups.
+# by default, all the reports are saved in /var/backups.
 #
 # requires dpkg, debconf-utils, sfdisk, and hwinfo
 #
@@ -25,6 +25,14 @@
 # (4) hardware information. 
 #     detailed information on most important aspects of the hardware.
 #
+# (5) the Luks header of every Luks block device, if option luksheaders
+#     is enabled.
+#     in case you (have to) scramble such a Luks header (for some time),
+#     and restore it later by running "dd if=luksheader.sda2.bin of=/dev/sda2"
+#     (MAKE SURE YOU PASS THE CORRECT DEVICE AS of= !!!)
+#
+# (6) LVM metadata for every detected volume group, if "lvm = yes"
+#
 
 # here are the defaults, commented out:
 
@@ -47,6 +55,16 @@
 # hardwarefile = /var/backups/hardware.txt
 # dohwinfo = yes
 
+# luksheaders = no
+# NOTE: the __star__ below will be replaced by the Luks partitions found on the
+# system (e.g. luksheader.sda2.bin, luksheader.sdb3.bin). If you change 
+# the luksheadersfile default below, be sure to include the __star__ 
+# replacement in the filename, or you will get one file for only one partition,
+# the others being written to the same file, and then overwritten by the next.
+# luksheadersfile = /var/backups/luksheader.__star__.bin
+
+# lvm = no
+
 # If vservers = yes in /etc/backupninja.conf then the following variables can
 # be used:
 # vsnames = all | <vserver1> <vserver2> ... (default = all)
diff --git a/handlers/maildir.in b/handlers/maildir.in
index 44959aa..148c30d 100644
--- a/handlers/maildir.in
+++ b/handlers/maildir.in
@@ -127,25 +127,6 @@ function do_user() {
 # (actually, it just moved them to the directory "deleted")
 
 function do_remove() {
-<<<<<<< HEAD
-	local tmp1=`maketemp maildir-tmp-file`
-	local tmp2=`maketemp maildir-tmp-file`
-	
-	ssh -p $destport -i $destid_file $destuser@$desthost mkdir -p "$destdir/deleted"
-        cd "$srcdir" 
-        for userdir in `ls -d1 */`; do
-           ls -1 "$srcdir/$userdir" | sort > $tmp1
-           ssh -p $destport $destuser@$desthost ls -1 "$destdir/$userdir" | sort > $tmp2
-		for deluser in `join -v 2 $tmp1 $tmp2`; do
-			[ "$deluser" != "" ] || continue
-                        info "removing $destuser@$desthost:$destdir/$userdir$deluser/"
-                        ssh -p $destport $destuser@$desthost mv "$destdir/$userdir$deluser/" "$destdir/deleted"
-			ssh -p $destport -i $destid_file $destuser@$desthost "date +%c%n%s > '$destdir/$userdir$deluser/deleted_on'"
-		done
-	done
-	rm $tmp1
-	rm $tmp2
-=======
    local tmp1=`maketemp maildir-tmp-file`
    local tmp2=`maketemp maildir-tmp-file`
 
@@ -163,7 +144,6 @@ function do_remove() {
    done
    rm $tmp1
    rm $tmp2
->>>>>>> master
 }
 
 function do_rotate() {
diff --git a/handlers/mysql.helper.in b/handlers/mysql.helper.in
index d42bc7f..997f73c 100644
--- a/handlers/mysql.helper.in
+++ b/handlers/mysql.helper.in
@@ -95,6 +95,11 @@ $hotcopy
 #
 $sqldump
 
+# sqldumpoptions = <options>
+# (default = --lock-tables --complete-insert --add-drop-table --quick --quote-names)
+# arguments to pass to mysqldump
+# sqldumpoptions = --add-drop-table --quick --quote-names
+
 # compress = < yes | no > (default = yes)
 # if yes, compress the sqldump output.
 $compress
diff --git a/man/backup.d.5 b/man/backup.d.5
index 5090051..fd5c9b2 100644
--- a/man/backup.d.5
+++ b/man/backup.d.5
@@ -67,7 +67,7 @@ Example templates for the action configuration files can be found in /usr/share/
 
 .SH SCHEDULING
 
-By default, each configuration file is processed everyday at 01:00 (1 AM). This can be changed by specifying the 'when' option in a backup action's config file or in the global configuration file. 
+By default, each configuration file is processed everyday at 01:00 (1 AM). This can be changed by specifying the 'when' option in a backup action's config file or in the global configuration file. Special value 'manual' will disable scheduling for the backup action. It is possible to run the backup action manually by invoking \fBninjahelper(1)\fP with --run command line argument.
 
 For example:
   when = sundays at 02:00
@@ -76,6 +76,7 @@ For example:
   when = everyday at 01
   when = Tuesday at 05:00
   when = hourly
+  when = manual
 
 These values for "when" are invalid:
   when = tuesday at 2am