aboutsummaryrefslogtreecommitdiff
path: root/handlers
diff options
context:
space:
mode:
Diffstat (limited to 'handlers')
-rw-r--r--handlers/maildir.in20
-rw-r--r--handlers/mysql.helper.in5
2 files changed, 5 insertions, 20 deletions
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