X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=90dd98b86769ff7d53c2eef5f5998c556afc58df;hb=fea8715a28357e82333579374c22ac5251614a50;hp=7c5d57f686f93f6ac0f1ecaa1c26b2735a2a1888;hpb=e13fd3c48245d48b0335649d294aacaee666bab5;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 7c5d57f6..90dd98b8 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -144,34 +144,14 @@ Check-Overrides
 
 Suite
 {
-  OldStable
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-  };
-
   Stable
   {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-  };
-
-  OldStable-Proposed-Updates
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
   };
 
   Proposed-Updates
@@ -237,9 +217,9 @@ Suite
 
 SuiteMappings
 {
+ "reject squeeze-backports";
  "silent-map squeeze-security stable-security";
  "silent-map wheezy-security testing-security";
- "propup-version oldstable-security stable testing testing-proposed-updates unstable";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
  "map squeeze stable";
@@ -247,15 +227,14 @@ SuiteMappings
  "map squeeze-updates proposed-updates";
  "map wheezy testing";
  "map wheezy-proposed-updates testing-proposed-updates";
+ "map wheezy-updates testing-proposed-updates";
  "map sid unstable";
  "map rc-buggy experimental";
- "map oldstable oldstable-proposed-updates";
- "map oldstable-security oldstable-proposed-updates";
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map stable-proposed-updates proposed-updates";
  "map stable-updates proposed-updates";
- "map-unreleased oldstable unstable";
+ "map testing-updates testing-proposed-updates";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";
@@ -295,6 +274,7 @@ AutomaticByHandPackages {
 
 Dir
 {
+  Base "/srv/ftp-master.debian.org/";
   Root "/srv/ftp-master.debian.org/ftp/";
   Pool "/srv/ftp-master.debian.org/ftp/pool/";
   Templates "/srv/ftp-master.debian.org/dak/templates/";
@@ -368,8 +348,6 @@ Generate-Releases
 {
   MD5Sum
   {
-    oldstable;
-    oldstable-proposed-updates;
     proposed-updates;
     stable;
     squeeze-updates;
@@ -380,8 +358,6 @@ Generate-Releases
   };
   SHA1
   {
-    oldstable;
-    oldstable-proposed-updates;
     proposed-updates;
     squeeze-updates;
     stable;
@@ -392,8 +368,6 @@ Generate-Releases
   };
   SHA256
   {
-    oldstable;
-    oldstable-proposed-updates;
     proposed-updates;
     squeeze-updates;
     stable;
@@ -403,3 +377,18 @@ Generate-Releases
     experimental;
   };
 }
+
+ByGroup {
+  ftpteam "";
+  backports "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-backports";
+};
+
+Command::DM {
+  ACL "dm";
+  AdminKeyrings {
+    "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
+  };
+  Keyrings {
+    "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
+  };
+};