X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=94a1b1b5d305983fbe01adcf00891787b256b380;hb=d31ae14a9de247d47d9ff7b3f36705a58a065916;hp=82a76cb78aa52bf4ab2403c9a4f1a9a54dc4caae;hpb=e627bb90af0d9c396b94c78708ef9a86ddf8b770;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 82a76cb7..94a1b1b5 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -217,6 +217,7 @@ Suite
 
 SuiteMappings
 {
+ "reject squeeze-backports";
  "silent-map squeeze-security stable-security";
  "silent-map wheezy-security testing-security";
  "propup-version stable-security testing testing-proposed-updates unstable";
@@ -226,12 +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 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";
@@ -376,6 +379,28 @@ Generate-Releases
 }
 
 ByGroup {
+  dak-unpriv "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-dak";
   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";
+  };
+};
+
+Command::DM-Admin {
+  AdminFingerprints {
+    "AB41C1C68AFD668CA045EBF8673A03E4C1DB921F"; // gwolf
+    "0E3A94C3E83002DAB88CCA1694FA372B2DA8B985"; // noodles
+
+    "80E976F14A508A48E9CA3FE9BC372252CA1CF964"; // ansgar
+    "FBFABDB541B5DC955BD9BA6EDB16CF5BB12525C4"; // joerg
+    "309911BEA966D0613053045711B4E5FF15B0FD82"; // mhy
+  };
+};