Merge branch 'master' into security

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

diff --git a/tools/debianqueued-0.9/config b/tools/debianqueued-0.9/config
index 4029440c18b61255f29c4c766cd10e0a47b05820..16c482a0ef7e26653b80d64618a9c8c4d3f7f687 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/upload.debian.org/pub/UploadQueue";
+$incoming = "/srv/upload.debian.org/ftp/pub/UploadQueue";
 
 # the delayed incoming directories
-$incoming_delayed = "/srv/upload.debian.org/pub/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.
@@ -125,6 +125,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:
 # -----------------