X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fdak.conf;h=890cd6b307120e245cc348449344fe4cc3834761;hb=fcfcdcc15785c01785b18fecc903b3aef2b367f6;hp=82af9cadace0cda0d295919de53dda997abb3795;hpb=717f343ebc3c5994b39aa03ccc7035f14faaa9e7;p=dak.git

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 82af9cad..890cd6b3 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";
@@ -33,11 +27,8 @@ Dinstall
    // If defined then mails to close bugs are sent to the bugserver.
    CloseBugs "false";
    OverrideDisparityCheck "false";
-   DefaultSuite "lenny-backports";
-   Reject
-   {
-     ReleaseTransitions "/srv/backports-master.debian.org/hints/transitions.yaml";
-   };
+   DefaultSuite "squeeze-backports";
+   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
@@ -83,18 +74,6 @@ Check-Overrides
 {
   OverrideSuites
   {
-    lenny-backports
-    {
-      Process "1";
-//      OriginSuite "Unstable";
-    };
-
-    lenny-backports-sloppy
-    {
-      Process "1";
-//      OriginSuite "Unstable";
-    };
-
     squeeze-backports
     {
       Process "1";
@@ -135,7 +114,7 @@ Control-Overrides
   Options
   {
     Component "main";
-    Suite "lenny-backports";
+    Suite "squeeze-backports";
     Type "deb";
    };
 };
@@ -144,7 +123,7 @@ Rm
 {
   Options
   {
-    Suite "lenny-backports";
+    Suite "squeeze-backports";
    };
 
    LogFile "/srv/backports-web.debian.org/underlay/removals.txt";
@@ -172,26 +151,6 @@ Process-New
 
 Suite
 {
-  lenny-backports
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-  };
-
-  lenny-backports-sloppy
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-  };
-
   squeeze-backports
   {
 	Components
@@ -206,29 +165,29 @@ Suite
 
 Dir
 {
+  Base "/srv/backports-master.debian.org/";
   Root "/srv/backports-master.debian.org/ftp/";
   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/";
   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/";
@@ -250,9 +209,6 @@ DB
 
 SuiteMappings
 {
- "map lenny lenny-backports";
- "map lenny-bpo lenny-backports";
- "map lenny-bpo-sloppy lenny-backports-sloppy";
  "map squeeze squeeze-backports";
  "map squeeze-bpo squeeze-backports";
 };
@@ -388,29 +344,18 @@ Import-LDAP-Fingerprints
   KeyServer "wwwkeys.eu.pgp.net";
 };
 
-Changelogs
-{
-  Export "/srv/backports-master.debian.org/export/changelogs";
-}
-
 Generate-Releases
 {
   MD5Sum
   {
-    lenny-backports;
-    lenny-backports-sloppy;
     squeeze-backports;
   };
   SHA1
   {
-    lenny-backports;
-    lenny-backports-sloppy;
     squeeze-backports;
   };
   SHA256
   {
-    lenny-backports;
-    lenny-backports-sloppy;
     squeeze-backports;
   };
 }