From: Joerg Jaspert Date: Sun, 12 Dec 2010 19:36:09 +0000 (+0100) Subject: Merge branch 'master' into security X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c2f147c52208ab618d5646968e9c3cb45a996d1;p=dak Merge branch 'master' into security * master: new lock dir embargo/disembargo build up a symlink farm for our buildds. Signed-off-by: Joerg Jaspert --- 4c2f147c52208ab618d5646968e9c3cb45a996d1 diff --cc config/debian-security/dak.conf index a693bfc4,0f77a7f4..f188359c --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@@ -38,7 -38,8 +38,8 @@@ Dinstal Process-New { - AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock"; + AcceptedLockFile "/srv/security-master.debian.org/lock/unchecked.lock"; + LockDir "/srv/security-master.debian.org/lock/new/"; }; Import-Users-From-Passwd