X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=dfd12bf96234d74c11d4c6fb3b23ac25ca5b9365;hb=ec257c02a5d62fd27844c70814acd9616b24b4c8;hp=31cd3de2818612fda62b19ae9989017c128acddf;hpb=b43ed3ff3738940ce46caa836d88b6937a76582c;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 31cd3de2..dfd12bf9 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -2,7 +2,6 @@ Dinstall
 {
    GPGKeyring {
      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-     "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
    };
    // was non-us.d.o path before
    SigningKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
@@ -26,7 +25,6 @@ Dinstall
    BXANotify "false";
    QueueBuildSuites
    {
-     oldstable;
      stable;
      testing;
    };
@@ -40,7 +38,8 @@ Dinstall
 
 Process-New
 {
-  AcceptedLockFile "/srv/security-master.debian.org/lock/unchecked.lock";
+  DinstallLockFile "/srv/security-master.debian.org/lock/processnew.lock";
+  LockDir "/srv/security-master.debian.org/lock/new/";
 };
 
 Import-Users-From-Passwd
@@ -54,9 +53,48 @@ Queue-Report
 {
   Directories
   {
-    // byhand;
-    // new;
+    byhand;
+    new;
     unembargoed;
+    embargoed;
+  };
+};
+
+Import-Keyring
+{
+  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
+    {
+      Debian-Maintainer "true";
+    };
+};
+
+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";
+};
+
+Check-Overrides
+{
+  OverrideSuites
+  {
+    Stable
+    {
+      Process "0";
+    };
+
+    Testing
+    {
+      Process "0";
+    };
+
   };
 };
 
@@ -112,25 +150,6 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  OldStable
-  {
-	Components 
-	{
-	  updates/main;
-	  updates/contrib;
-	  updates/non-free;
-	};
-	Announce "dak@security.debian.org";
-	Version "";
-	Origin "Debian";
-	Label "Debian-Security";
-	Description "Debian 4.0 Security Updates";
-	ValidTime 864000; // 10 days
-	CodeName "etch";
-	OverrideCodeName "etch";
-	CopyDotDak "/srv/security-master.debian.org/queue/done/";
-  };
-
   Stable
   {
 	Components 
@@ -190,6 +209,7 @@ Dir
   PoolRoot "pool/";
   Override "/srv/security-master.debian.org/override/";
   Lock "/srv/security-master.debian.org/lock/";
+  Cache "/srv/security-master.debian.org/database/";
   Lists "/srv/security-master.debian.org/dak-database/dists/";
   Log "/srv/security-master.debian.org/dak-log/";
   Morgue "/srv/security-master.debian.org/morgue/";
@@ -199,13 +219,14 @@ Dir
   Upload "/srv/queued/ftpmaster/";
   Queue
   {
-    Accepted "/srv/security-master.debian.org/queue/accepted/";
     Byhand "/srv/security-master.debian.org/queue/byhand/";
     Done "/srv/security-master.debian.org/queue/done/";
     Holding "/srv/security-master.debian.org/queue/holding/";
     New "/srv/security-master.debian.org/queue/new/";
     Reject "/srv/security-master.debian.org/queue/reject/";
     Unchecked "/srv/security-master.debian.org/queue/unchecked/";
+    Newstage "/srv/security-master.debian.org/queue/newstage/";
+
     ProposedUpdates "/does/not/exist/"; // XXX fixme
     OldProposedUpdates "/does/not/exist/"; // XXX fixme