Remove unused MorgueReject setting

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 020a9963fa1e5afb5441e5a23132bd3a4f5b1cb1..7f64bb46fe47a0768a95957940675cfd802c1e6b 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -219,7 +219,6 @@ Dir
   Log "/srv/backports-master.debian.org/log/";
   Lock "/srv/backports-master.debian.org/lock";
   Morgue "/srv/backports-master.debian.org/morgue/";
-  MorgueReject "reject";
   Override "/srv/backports-master.debian.org/scripts/override/";
   QueueBuild "/srv/backports-master.debian.org/buildd/";
   UrgencyLog "/srv/backports-master.debian.org/testing/urgencies/";

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index fc4017d7cf26f03c7778c980b95c893221d603cc..5f09abf2a84c643fa9d7e9dba7976b468a37f127 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -236,7 +236,6 @@ Dir
   Lists "/srv/security-master.debian.org/dak-database/dists/";
   Log "/srv/security-master.debian.org/dak-log/";
   Morgue "/srv/security-master.debian.org/morgue/";
-  MorgueReject "reject";
   Override "/srv/security-master.debian.org/scripts/override/";
   QueueBuild "/srv/security-master.debian.org/buildd/";
   Upload "/srv/queued/ftpmaster/";

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 42659d964c88f5b4d357f055650dc7fe52ba5afd..f5424dcca280d65b0b0cc83c86b6a56fff9251bb 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -332,7 +332,6 @@ Dir
   Log "/srv/ftp-master.debian.org/log/";
   Lock "/srv/ftp-master.debian.org/lock";
   Morgue "/srv/ftp-master.debian.org/morgue/";
-  MorgueReject "reject";
   Override "/srv/ftp-master.debian.org/scripts/override/";
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
   TempPath "/srv/ftp-master.debian.org/tmp/";

diff --git a/docs/README.config b/docs/README.config
index a20cfc9f06d548520d807d8c2b847d5f4275f02d..30682fb84f8afd3eadfc82a035cefac79f99b69f 100644 (file)
--- a/docs/README.config
+++ b/docs/README.config
@@ -39,7 +39,6 @@ Mandatory.  List of directory locations, e.g.
 |   Lists "/org/ftp.debian.org/database/dists/";
 |   Log "/org/ftp.debian.org/log/";
 |   Morgue "/org/ftp.debian.org/morgue/";
-|   MorgueReject "reject";
 |   QueueBuild "/org/incoming.debian.org/buildd/";
 |   UrgencyLog "/org/ftp.debian.org/testing/urgencies/";
 |   Queue
@@ -79,10 +78,6 @@ Morgue (required): Removed files are moved there.  The morgue has various
 sub-directories, including (optionally) those defined by
 Clean-Queues::MorgueSubDir and Clean-Suites::MorgueSubDir.
 
-MorgueReject (required): if dak cannot move a rejected package to
-Dir::Queue::Reject, it will try to move it to the Dir::MorgueReject
-directory located under Dir::Morgue.
-
 QueueBuild (optional): This variable is only relevant if any suites
 are to be auto built, i.e. if Dinstall::QueueBuildSuites has any
 values.