X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tools%2Fdebianqueued-0.9%2Fconfig-backports;h=24cdc4c33c6cc91ed3a9c47e2d793e8789e25d70;hb=3c17826a6dcc24fb4b0ae89abb8e0539fc15ebe0;hp=f04e925df7bbdd1d64967c5066af1298a1a0bf9a;hpb=7d482ac46f54cf2a7811a7ac29a3df0021738f1a;p=dak.git

diff --git a/tools/debianqueued-0.9/config-backports b/tools/debianqueued-0.9/config-backports
index f04e925d..24cdc4c3 100644
--- a/tools/debianqueued-0.9/config-backports
+++ b/tools/debianqueued-0.9/config-backports
@@ -47,13 +47,13 @@ $max_delayed = -1;
 $keep_files = '(status|\.message|README)$';
 
 # file patterns that aren't deleted right away
-$valid_files = '(\.changes|\.tar\.(?:gz|bz2)|\.dsc|\.u?deb|diff\.gz|\.sh)$';
+$valid_files = '(\.changes|\.tar\.(?:gz|bz2|xz)|\.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;
+$check_md5sum = 0;
 
 # name of the status file or named pipe in the incoming dir
 $statusfile = "$incoming/status";
@@ -63,25 +63,40 @@ $statusfile = "$incoming/status";
 $statusdelay = 30;
 
 # names of the keyring files
-@keyrings = ( "/srv/backports-master.debian.org/keyrings/keyring.gpg" );
+@keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-alpha-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-amd64-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-arm64-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-armel-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-hurd-i386-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-i386-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-ia64-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-kfreebsd-amd64-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-kfreebsd-i386-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mipsel-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mips-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-powerpc-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-sparc-keyring.gpg");
 
 # our log file
-$logfile = "$queued_dir/log";
+$logfile = "$queued_dir/run/log";
 
 # our pid file
-$pidfile = "$queued_dir/pid";
+$pidfile = "$queued_dir/run/pid";
 
 # upload method (ssh, copy, ftp)
-$upload_method = "copy";
+$upload_method = "ftp";
 
 # name of target host (ignored on copy method)
-$target = "localhost";
+$target = "ftp-master.debian.org";
 
 # login name on target host (for ssh, always 'ftp' for ftp, ignored for copy)
-$targetlogin = "queue";
+$targetlogin = "ftp";
 
 # incoming on target host
-$targetdir = "/srv/backports-master.debian.org/queue/unchecked/";
+$targetdir = "/pub/UploadQueue/";
 
 # incoming/delayed on target host
 $targetdir_delayed = "/srv/upload.debian.org/DEFERRED/%d-day";