Merge branch 'master' into security

[dak.git] / tools / debianqueued-0.9 / config-upload

diff --git a/tools/debianqueued-0.9/config-upload b/tools/debianqueued-0.9/config-upload
index 8e1b87bfc45c98ea27373dd4b17b592778e364db..77cc90d7a264cd0cfea475782ee655dbe73f7990 100644 (file)
--- a/tools/debianqueued-0.9/config-upload
+++ b/tools/debianqueued-0.9/config-upload
@@ -47,11 +47,14 @@ $max_delayed = -1;
 $keep_files = '(status|\.message|README)$';
 
 # file patterns that aren't deleted right away
-$valid_files = '(\.changes|\.tar\.gz|\.dsc|\.u?deb|diff\.gz|\.sh)$';
+$valid_files = '(\.changes|\.tar\.(?:gz|bz2)|\.dsc|\.u?deb|diff\.gz|\.sh)$';
 
 # Change files to mode 644 locally (after md5 check) or only on master?
 $chmod_on_target = 0;
 
+# Do an md5sum check?
+$check_md5sum = 0;
+
 # name of the status file or named pipe in the incoming dir
 $statusfile = "$incoming/status";
 
@@ -61,7 +64,7 @@ $statusdelay = 30;
 
 # names of the keyring files
 @keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg",
-              "/srv/keyring.debian.org/keyrings/debian-keyring.pgp");
+              "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg" );
 
 # our log file
 $logfile = "$queued_dir/log";
@@ -73,7 +76,7 @@ $pidfile = "$queued_dir/pid";
 $upload_method = "ftp";
 
 # name of target host (ignored on copy method)
-$target = "ftp.upload.debian.org";
+$target = "ftp-master.debian.org";
 
 # login name on target host (for ssh, always 'ftp' for ftp, ignored for copy)
 $targetlogin = "ftp";
@@ -85,7 +88,7 @@ $targetdir = "/pub/UploadQueue/";
 $targetdir_delayed = "/srv/queued/DEFERRED/%d-day";
 
 # select FTP debugging
-$ftpdebug = 1;
+$ftpdebug = 0;
 
 # FTP timeout
 $ftptimeout = 900;
@@ -122,6 +125,8 @@ $remote_timeout = 3*60*60; # 3 hours
 # mail address of maintainer
 $maintainer_mail = "ftpmaster\@debian.org";
 
+# to override the TO address of ALL outgoing mail, set this value.
+$overridemail = "";
 
 # logfile rotating:
 # -----------------