X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=fc0ec404969de84bcd9788a54f3ae2609a953dc6;hb=fcfcdcc15785c01785b18fecc903b3aef2b367f6;hp=251267b0bfbd1bb3433753856ce39aac73c0c42a;hpb=a5346f1b1e9808e94bdb32d463b75eb2eda95414;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 251267b0..fc0ec404 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/";
 };
 
@@ -277,7 +277,6 @@ Dir
   Root "/srv/ftp-master.debian.org/ftp/";
   Pool "/srv/ftp-master.debian.org/ftp/pool/";
   Templates "/srv/ftp-master.debian.org/dak/templates/";
-  Export "/srv/ftp-master.debian.org/export/";
   Lists "/srv/ftp-master.debian.org/database/dists/";
   Cache "/srv/ftp-master.debian.org/database/";
   Log "/srv/ftp-master.debian.org/log/";
@@ -378,6 +377,7 @@ 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";
 };
@@ -391,3 +391,14 @@ Command::DM {
     "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
   };
 };
+
+Command::DM-Admin {
+  AdminFingerprints {
+    "AB41C1C68AFD668CA045EBF8673A03E4C1DB921F"; // gwolf
+    "0E3A94C3E83002DAB88CCA1694FA372B2DA8B985"; // noodles
+
+    "80E976F14A508A48E9CA3FE9BC372252CA1CF964"; // ansgar
+    "FBFABDB541B5DC955BD9BA6EDB16CF5BB12525C4"; // joerg
+    "309911BEA966D0613053045711B4E5FF15B0FD82"; // mhy
+  };
+};