Merge branch 'master' into security

* master:
  new lock dir
  embargo/disembargo build up a symlink farm for our buildds.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index a693bfc458ea13279456889b50666d002108a53e..f188359c86232e679e3b01d785731e4389dd8572 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -39,6 +39,7 @@ Dinstall
 Process-New
 {
   AcceptedLockFile "/srv/security-master.debian.org/lock/unchecked.lock";
+  LockDir "/srv/security-master.debian.org/lock/new/";
 };
 
 Import-Users-From-Passwd