Merge branch 'master' into security

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

diff --git a/tools/debianqueued-0.9/config-security b/tools/debianqueued-0.9/config-security
index 2f0d86739be3b480b96c684bd0ef6d824da4f672..6989cda4f1138c70dfeec7b8d9a795d90c530aa1 100644 (file)
--- a/tools/debianqueued-0.9/config-security
+++ b/tools/debianqueued-0.9/config-security
@@ -34,7 +34,7 @@ $ssh_options = "-o'BatchMode yes' -o'FallBackToRsh no' ".
 $ssh_key_file = "";
 
 # the incoming dir we live in
-$incoming = "/srv/queued/UploadQueue";
+$incoming = "/srv/queued/ftpmaster";
 
 # the delayed incoming directories
 $incoming_delayed = "/srv/queued/UploadQueue/DELAYED/%d-day";
@@ -63,8 +63,7 @@ $statusfile = "$incoming/status";
 $statusdelay = 30;
 
 # names of the keyring files
-@keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg",
-              "/srv/keyring.debian.org/keyrings/debian-keyring.pgp");
+@keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg" );
 
 # our log file
 $logfile = "$queued_dir/log";