X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fdak.conf;h=bb8f02a723efc9f1b41031a300b8b26a96eed61a;hb=3454f82e83865434b3de80c27a594394d67329d0;hp=4d9b90f100faf9018ee2b64a4d00372886dea74b;hpb=649ba796592be876e36088e9440a16f1bdd8e87c;p=dak.git

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 4d9b90f1..bb8f02a7 100644
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -9,7 +9,7 @@ Dinstall
    // Note: Key must be without a passphrase or it wont work automagically!
    SigningKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "16BA136C";
+   SigningKeyIds "16BA136C 55BE302B";
    SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";
    MyEmailAddress "backports.debian.org archive Installer <installer@backports.debian.org>";
    MyAdminAddress "ftpmaster@backports.debian.org";
@@ -83,7 +83,7 @@ Add-User
 
 Show-New
 {
-  HTMLPath "/srv/backports-master.debian.org/web/new/";
+  HTMLPath "/srv/backports-web.debian.org/underlay/new/";
 }
 
 Check-Overrides
@@ -118,6 +118,14 @@ Import-Users-From-Passwd
   KnownPostgres "postgres,katie,dak,www-data,qa,guest";
 };
 
+Queue-Report
+{
+  ReportLocations
+  {
+    822Location "/srv/backports-web.debian.org/underlay/new.822";
+  };
+};
+
 Clean-Queues
 {
   Options
@@ -166,7 +174,7 @@ Clean-Suites
 
 Process-New
 {
-  AcceptedLockFile "/srv/backports-master.debian.org/lock/unchecked.lock";
+  DinstallLockFile "/srv/backports-master.debian.org/lock/processnew.lock";
   LockDir "/srv/backports-master.debian.org/lock/new/";
 };
 
@@ -233,6 +241,7 @@ Dir
     Reject "/srv/backports-master.debian.org/queue/reject/";
     Unchecked "/srv/backports-master.debian.org/queue/unchecked/";
     BTSVersionTrack "/srv/backports-master.debian.org/queue/bts_version_track/";
+    Newstage "/srv/ftp-master.debian.org/queue/newstage/";
     Embargoed "/srv/backports-master.debian.org/queue/Embargoed/";
     Unembargoed "/srv/backports-master.debian.org/queue/Unembargoed/";
     ProposedUpdates "/srv/backports-master.debian.org/queue/p-u-new/";
@@ -414,3 +423,16 @@ Common
   // The default number of threads for multithreading parts of dak:
   ThreadCount 16;
 }
+
+Import-LDAP-Fingerprints
+{
+  LDAPDn "ou=users,dc=debian,dc=org";
+  LDAPServer "db.debian.org";
+  ExtraKeyrings
+  {
+    "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
+    "/srv/keyring.debian.org/keyrings/removed-keys.gpg";
+    "/srv/keyring.debian.org/keyrings/extra-keys.pgp";
+  };
+  KeyServer "wwwkeys.eu.pgp.net";
+};