X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=251267b0bfbd1bb3433753856ce39aac73c0c42a;hb=9f25fd36ea9cef49c01c40e90f7a783dfc73c8e8;hp=532d53a7eef44b982f613c8516513a74b8da722b;hpb=261addb5c925a2aa5f87d65bf9d096d9cd70a04a;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 532d53a7..251267b0 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -226,12 +226,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 stable proposed-updates";
  "map stable-security proposed-updates";
  "map stable-proposed-updates proposed-updates";
  "map stable-updates proposed-updates";
+ "map testing-updates testing-proposed-updates";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";
@@ -271,6 +273,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/";
@@ -373,3 +376,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";
+  };
+};