X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=d74d564104fe7cbdb9b93d942f63f9b4ab5661f8;hb=db2d829cce8f0dd8aadb6af5e6258ab4fced871d;hp=6b5e17a9db52dc157b4f063d76b55333775e3099;hpb=61eb4e708c28e6ee5ffa8b7fbbd6c3e0ad4887fc;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 6b5e17a9..d74d5641 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -21,10 +21,7 @@ Dinstall
    OverrideDisparityCheck "true";
    DefaultSuite "unstable";
    LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags";
-   Reject
-   {
-     ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
-   };
+   ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
    // if you setup an own dak repository and want to upload Debian packages you most possibly want
    // to set the following option to a real path/filename and then enter those mail addresses that
    // you want to be able to receive mails generated by your dak installation. This avoids spamming
@@ -319,7 +316,6 @@ Dir
   Pool "/srv/ftp-master.debian.org/ftp/pool/";
   Templates "/srv/ftp-master.debian.org/dak/templates/";
   Export "/srv/ftp-master.debian.org/export/";
-  PoolRoot "pool/";
   Lists "/srv/ftp-master.debian.org/database/dists/";
   Cache "/srv/ftp-master.debian.org/database/";
   Log "/srv/ftp-master.debian.org/log/";
@@ -328,6 +324,9 @@ Dir
   Override "/srv/ftp-master.debian.org/scripts/override/";
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
   TempPath "/srv/ftp-master.debian.org/tmp/";
+  BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
+  Holding "/srv/ftp-master.debian.org/queue/holding/";
+
   Queue
   {
     Byhand "/srv/ftp-master.debian.org/queue/byhand/";
@@ -335,12 +334,10 @@ Dir
     OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/";
     ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
     Done "/srv/ftp-master.debian.org/queue/done/";
-    Holding "/srv/ftp-master.debian.org/queue/holding/";
     New "/srv/ftp-master.debian.org/queue/new/";
     Reject "/srv/ftp-master.debian.org/queue/reject/";
     Unchecked "/srv/ftp-master.debian.org/queue/unchecked/";
     Newstage "/srv/ftp-master.debian.org/queue/newstage/";
-    BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
     Embargoed "/srv/ftp-master.debian.org/does/not/exist/";
     Unembargoed "/srv/ftp-master.debian.org/does/not/exist/";
     Disembargo "/srv/ftp-master.debian.org/does/not/exist/";
@@ -366,16 +363,6 @@ DB
   Unicode "false"
 };
 
-Archive
-{
-  ftp-master
-  {
-    OriginServer "ftp-master.debian.org";
-    PrimaryMirror "ftp.debian.org";
-    Description "Master Archive for the Debian project";
-  };
-};
-
 Urgency
 {
   Default "low";