X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=85ff4a39aa5f7da45a416d2a27f16b28ca713978;hb=1dd3d2fb2df2af57cf3966e257a94e000235407a;hp=953a01194da6be40542f8e70f4e9156d29dd8fd6;hpb=0316e6cb305b3ab39cfe94cc183839a25bcc46cb;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 953a0119..85ff4a39 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -48,6 +48,7 @@ Generate-Index-Diffs
 Show-New
 {
   HTMLPath "/srv/ftp.debian.org/web/new/";
+  Options::Queue "new,backports-new";
 }
 
 Show-Deferred
@@ -60,7 +61,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,katie,release,qa,www-data,guest,repuser";
+  KnownPostgres "postgres,dak,dak-unpriv,katie,release,qa,www-data,guest,repuser";
 };
 
 Clean-Queues
@@ -116,7 +117,6 @@ Clean-Suites
 
 Process-New
 {
-  DinstallLockFile "/srv/ftp-master.debian.org/lock/processnew.lock";
   LockDir "/srv/ftp-master.debian.org/lock/new/";
 };
 
@@ -144,6 +144,16 @@ Check-Overrides
 
 Suite
 {
+  Stable
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+  };
+
   Proposed-Updates
   {
 	Components
@@ -216,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";
@@ -261,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/";
@@ -363,3 +376,30 @@ Generate-Releases
     experimental;
   };
 }
+
+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
+  };
+};