X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=721950b9fa765c930fe54c53647b8eecae78621c;hb=7ba4ac6dfc9ec4473e99b814a35add978cc00264;hp=42659d964c88f5b4d357f055650dc7fe52ba5afd;hpb=a4eef13f8450fe8b109f4fafc074d50f0fda0a7c;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 42659d96..721950b9 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,9 +1,5 @@
 Dinstall
 {
-   GPGKeyring {
-      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-      "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
-   };
    SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
 //   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
@@ -25,11 +21,7 @@ Dinstall
    OverrideDisparityCheck "true";
    DefaultSuite "unstable";
    LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags";
-   Reject
-   {
-     NoSourceOnly "true";
-     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
@@ -89,8 +81,6 @@ Control-Overrides
     Suite "unstable";
     Type "deb";
    };
-
- ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
 };
 
 Rm
@@ -326,29 +316,28 @@ 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/";
   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/";
+  BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
+  Holding "/srv/ftp-master.debian.org/queue/holding/";
+  Done "/srv/ftp-master.debian.org/queue/done/";
+
   Queue
   {
     Byhand "/srv/ftp-master.debian.org/queue/byhand/";
     ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
     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/";
@@ -374,44 +363,6 @@ DB
   Unicode "false"
 };
 
-Archive
-{
-  ftp-master
-  {
-    OriginServer "ftp-master.debian.org";
-    PrimaryMirror "ftp.debian.org";
-    Description "Master Archive for the Debian project";
-  };
-};
-
-Component
-{
-  main
-  {
-	Description "Main";
-	MeetsDFSG "true";
-  };
-
-  contrib
-  {
-	Description "Contrib";
-	MeetsDFSG "true";
-  };
-
-  non-free
-  {
-	Description "Software that fails to meet the DFSG";
-	MeetsDFSG "false";
-  };
-};
-
-OverrideType
-{
-  deb;
-  udeb;
-  dsc;
-};
-
 Urgency
 {
   Default "low";