Merge branch 'master' into security

[dak.git] / config / debian-security / dak.conf

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 42e400e9c3b95ef5ae08c43ad6f63aff1ae87a8b..6c977a4155e4843901b67e2598ab542b6643ebf7 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -38,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
@@ -79,6 +80,23 @@ Import-LDAP-Fingerprints
   KeyServer "wwwkeys.eu.pgp.net";
 };
 
+Check-Overrides
+{
+  OverrideSuites
+  {
+    Stable
+    {
+      Process "0";
+    };
+
+    Testing
+    {
+      Process "0";
+    };
+
+  };
+};
+
 Clean-Queues
 {
   Options
@@ -190,6 +208,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/";