X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tools%2Fdebianqueued-0.9%2Fconfig;h=2e6f41f3b3a7c296eb284c1af95fb605834f6348;hb=0872b2e0b78670c91fd2bf0bda52e5761e079820;hp=139982b7cd2f1cffa4d613ef5ac3e04e1f2c6e5d;hpb=9eb4b6222ce4cd1a31956c8781dca415e994cca6;p=dak.git

diff --git a/tools/debianqueued-0.9/config b/tools/debianqueued-0.9/config
index 139982b7..2e6f41f3 100644
--- a/tools/debianqueued-0.9/config
+++ b/tools/debianqueued-0.9/config
@@ -34,10 +34,10 @@ $ssh_options = "-o'BatchMode yes' -o'FallBackToRsh no' ".
 $ssh_key_file = "";
 
 # the incoming dir we live in
-$incoming = "/srv/queued/UploadQueue";
+$incoming = "/srv/upload.debian.org/ftp/pub/UploadQueue";
 
 # the delayed incoming directories
-$incoming_delayed = "/srv/queued/UploadQueue/DELAYED/%d-day";
+$incoming_delayed = "/srv/upload.debian.org/ftp/pub/UploadQueue/DELAYED/%d-day";
 
 # maximum delay directory, -1 for no delayed directory,
 # incoming_delayed and target_delayed need to exist.
@@ -47,11 +47,14 @@ $max_delayed = 15;
 $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 after upload?
+$check_md5sum = 1;
+
 # name of the status file or named pipe in the incoming dir
 $statusfile = "$incoming/status";
 
@@ -61,8 +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/ftp.debian.org/keyrings/debian-maintainers.gpg" );
+              "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg" );
 
 # our log file
 $logfile = "$queued_dir/log";
@@ -80,10 +82,10 @@ $target = "localhost";
 $targetlogin = "queue";
 
 # incoming on target host
-$targetdir = "/srv/ftp.debian.org/queue/unchecked/";
+$targetdir = "/srv/ftp-master.debian.org/queue/unchecked/";
 
 # incoming/delayed on target host
-$targetdir_delayed = "/srv/queued/DELAYED/%d-day";
+$targetdir_delayed = "/srv/upload.debian.org/DEFERRED/%d-day";
 
 # select FTP debugging
 #$ftpdebug = 0;