Merge commit 'ftpmaster/master' into sqlalchemy

[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 1b72e88d7e67f1970e5f789a374aef93e4939c09..633972fa860ee5e968d99c1b8c0222290c45eb32 100644 (file)
--- a/tools/debianqueued-0.9/config-upload
+++ b/tools/debianqueued-0.9/config-upload
@@ -64,7 +64,8 @@ $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-keyring.pgp",
+              "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg" );
 
 # our log file
 $logfile = "$queued_dir/log";
@@ -76,7 +77,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";