add the new keyrings to the queueds

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

diff --git a/tools/debianqueued-0.9/config b/tools/debianqueued-0.9/config
index 1fe0b0e312987892698400d667e43403ecbf6486..e4d3caecaa4a77f4c2380274816d55c39ed43e0f 100644 (file)
--- 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.
@@ -64,8 +64,22 @@ $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" );
+              "/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-armel-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-arm-keyring.gpg",
+              "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-hppa-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";
@@ -83,10 +97,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/DEFERRED/%d-day";
+$targetdir_delayed = "/srv/upload.debian.org/DEFERRED/%d-day";
 
 # select FTP debugging
 #$ftpdebug = 0;
@@ -126,6 +140,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:
 # -----------------