X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fdak.conf;h=0955995302ccbe6e23b3aa1f2a1972ca3b691c4f;hb=5229fa5525b627414d96fe11b8f6853d3d58d29e;hp=020a9963fa1e5afb5441e5a23132bd3a4f5b1cb1;hpb=1a4b643db176562f925668b258fa3882634bb759;p=dak.git

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 020a9963..09559953 100644
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -1,10 +1,5 @@
 Dinstall
 {
-   // Both need to be defined at the moment, but they can point to the
-   // same file.
-   GPGKeyring {
-      "/srv/backports-master.debian.org/keyrings/keyring.gpg";
-   };
    // To sign the release files. Adjust the keyid!
    // Note: Key must be without a passphrase or it wont work automagically!
    SigningKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
@@ -22,7 +17,6 @@ Dinstall
    // actions related to the package. For an example look at
    // packages.qa.debian.org
    // TrackingServer "packages.qa.test.backports.org";
-   LockFile "/srv/backports-master.debian.org/lock/dinstall.lock";
    // If defined this address gets a bcc of all mails.
    // FIXME: Einrichten wenn das hier produktiv geht!
    Bcc "debian-backports-changes@lists.debian.org";
@@ -34,11 +28,7 @@ Dinstall
    CloseBugs "false";
    OverrideDisparityCheck "false";
    DefaultSuite "lenny-backports";
-   Reject
-   {
-     NoSourceOnly "true";
-     ReleaseTransitions "/srv/backports-master.debian.org/hints/transitions.yaml";
-   };
+   ReleaseTransitions "/srv/backports-master.debian.org/hints/transitions.yaml";
    // If set, only send mails to addresses listed there.
    // format of entries: one entry per line. Either an email address directly, or a regular expression,
    // prefixed by "RE:". Examples: "jane.doe@domain.com" or "RE:jane[^@]@domain.com", where the first will
@@ -139,8 +129,6 @@ Control-Overrides
     Suite "lenny-backports";
     Type "deb";
    };
-
- ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
 };
 
 Rm
@@ -213,26 +201,24 @@ Dir
   Pool "/srv/backports-master.debian.org/ftp/pool/";
   Export "/srv/backports-master.debian.org/export/";
   Templates "/srv/backports-master.debian.org/dak/templates/";
-  PoolRoot "pool/";
   Lists "/srv/backports-master.debian.org/database/dists/";
   Cache "/srv/backports-master.debian.org/database/";
   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/";
   TempPath "/srv/backports-master.debian.org/tmp";
+  BTSVersionTrack "/srv/backports-master.debian.org/queue/bts_version_track/";
+  Holding "/srv/backports-master.debian.org/queue/holding/";
+  Done "/srv/backports-master.debian.org/queue/done/";
+  Reject "/srv/backports-master.debian.org/queue/reject/";
+
   Queue
   {
     Byhand "/srv/backports-master.debian.org/queue/byhand/";
-    Done "/srv/backports-master.debian.org/queue/done/";
-    Holding "/srv/backports-master.debian.org/queue/holding/";
     New "/srv/backports-master.debian.org/queue/new/";
-    Reject "/srv/backports-master.debian.org/queue/reject/";
     Unchecked "/srv/backports-master.debian.org/queue/unchecked/";
-    BTSVersionTrack "/srv/backports-master.debian.org/queue/bts_version_track/";
     Newstage "/srv/backports-master.debian.org/queue/newstage/";
     Embargoed "/srv/backports-master.debian.org/queue/Embargoed/";
     Unembargoed "/srv/backports-master.debian.org/queue/Unembargoed/";
@@ -294,28 +280,6 @@ Archive
   };
 };
 
-Component
-{
-  main
-  {
-	Description "Main";
-	MeetsDFSG "true";
-  };
-
-  contrib
-  {
-	Description "Contrib";
-	MeetsDFSG "true";
-  };
-
-  non-free
-  {
-     Description "Software that fails to meet the DFSG";
-     MeetsDFSG "false";
-  };
-
-};
-
 Section
 {
   admin;
@@ -382,24 +346,6 @@ Priority
   source 0; // i.e. unused
 };
 
-OverrideType
-{
-  deb;
-  udeb;
-  dsc;
-};
-
-Location
-{
-  // Pool locations on backports.debian.org
-  /srv/backports-master.debian.org/ftp/pool/
-    {
-      Archive "backports";
-      Type "pool";
-    };
-
-};
-
 Urgency
 {
   Default "low";