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 --combined config/debian-security/dak.conf
index a693bfc458ea13279456889b50666d002108a53e,0f77a7f49e61b9286f13890a8932d36d8bda4318..f188359c86232e679e3b01d785731e4389dd8572
--- 1/config/debian-security/dak.conf
--- 2/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@@ -1,11 -1,10 +1,11 @@@
  Dinstall
  {
     GPGKeyring {
 -     "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
 +     "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
     };
 -   SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
 -   SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
 +   // was non-us.d.o path before
 +   SigningKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
 +   SigningPubKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
     SigningKeyIds "55BE302B";
     SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
     MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
@@@ -14,7 -13,7 +14,7 @@@
     MyDistribution "Debian"; // Used in emails
     BugServer "bugs.debian.org";
     PackagesServer "packages.debian.org";
 -   LockFile "/org/security.debian.org/dak/lock";
 +   LockFile "/org/security-master.debian.org/dak/lock";
     Bcc "archive@ftp-master.debian.org";
     // GroupOverrideFilename "override.group-maint";
     FutureTimeTravelGrace 28800; // 8 hours
@@@ -25,6 -24,7 +25,6 @@@
     BXANotify "false";
     QueueBuildSuites
     {
 -     oldstable;
       stable;
       testing;
     };
@@@ -38,7 -38,8 +38,8 @@@
  
  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
@@@ -58,44 -59,6 +59,44 @@@ Queue-Repor
    };
  };
  
 +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";
 +    };
 +
 +  };
 +};
 +
  Clean-Queues
  {
    Options
@@@ -113,12 -76,12 +114,12 @@@ R
    };
  
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
 -  LogFile "/org/security.debian.org/dak-log/removals.txt";
 +  LogFile "/srv/security-master.debian.org/dak-log/removals.txt";
  };
  
  Init-Archive
  {
 -  ExportDir "/org/security.debian.org/dak/import-archive-files/";
 +  ExportDir "/srv/security-master.debian.org/dak/import-archive-files/";
  };
  
  Clean-Suites
@@@ -148,6 -111,25 +149,6 @@@ Suit
    // 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 "/org/security.debian.org/queue/done/";
 -  };
 -
    Stable
    {
        Components 
@@@ -164,7 -146,7 +165,7 @@@
        ValidTime 864000; // 10 days
        CodeName "lenny";
        OverrideCodeName "lenny";
 -      CopyDotDak "/org/security.debian.org/queue/done/";
 +      CopyDotDak "/srv/security-master.debian.org/queue/done/";
    };
  
    Testing
@@@ -183,7 -165,7 +184,7 @@@
        ValidTime 864000; // 10 days
        CodeName "squeeze";
        OverrideCodeName "squeeze";
 -      CopyDotDak "/org/security.debian.org/queue/done/";
 +      CopyDotDak "/srv/security-master.debian.org/queue/done/";
    };
  };
  
@@@ -200,37 -182,35 +201,37 @@@ SuiteMapping
  
  Dir
  {
 -  Root "/org/security.debian.org/ftp/";
 -  Pool "/org/security.debian.org/ftp/pool/";
 -  Dak "/org/security.debian.org/dak/";
 -  Templates "/org/security.debian.org/dak/templates/";
 +  Root "/srv/security-master.debian.org/ftp/";
 +  Pool "/srv/security-master.debian.org/ftp/pool/";
 +  Dak "/srv/security-master.debian.org/dak/";
 +  Templates "/srv/security-master.debian.org/dak/templates/";
    PoolRoot "pool/";
 -  Override "/org/security.debian.org/override/";
 -  Lock "/org/security.debian.org/lock/";
 -  Lists "/org/security.debian.org/dak-database/dists/";
 -  Log "/org/security.debian.org/dak-log/";
 -  Morgue "/org/security.debian.org/morgue/";
 +  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/";
    MorgueReject "reject";
 -  Override "/org/security.debian.org/scripts/override/";
 -  QueueBuild "/org/security.debian.org/buildd/";
 -  Upload "/srv/queued/UploadQueue/";
 +  Override "/srv/security-master.debian.org/scripts/override/";
 +  QueueBuild "/srv/security-master.debian.org/buildd/";
 +  Upload "/srv/queued/ftpmaster/";
    Queue
    {
 -    Accepted "/org/security.debian.org/queue/accepted/";
 -    Byhand "/org/security.debian.org/queue/byhand/";
 -    Done "/org/security.debian.org/queue/done/";
 -    Holding "/org/security.debian.org/queue/holding/";
 -    New "/org/security.debian.org/queue/new/";
 -    Reject "/org/security.debian.org/queue/reject/";
 -    Unchecked "/org/security.debian.org/queue/unchecked/";
 +    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
  
 -    Embargoed "/org/security.debian.org/queue/embargoed/";
 -    Unembargoed "/org/security.debian.org/queue/unembargoed/";
 -    Disembargo "/org/security.debian.org/queue/unchecked-disembargo/";
 +    Embargoed "/srv/security-master.debian.org/queue/embargoed/";
 +    Unembargoed "/srv/security-master.debian.org/queue/unembargoed/";
 +    Disembargo "/srv/security-master.debian.org/queue/unchecked-disembargo/";
    };
  };
  
@@@ -259,8 -239,6 +260,8 @@@ Architecture
    s390 "IBM S/390";
    sparc "Sun SPARC/UltraSPARC";
    amd64 "AMD x86_64 (AMD64)";
 +  kfreebsd-i386 "GNU/kFreeBSD i386";
 +  kfreebsd-amd64 "GNU/kFreeBSD amd64";
  
  };
  
@@@ -384,7 -362,7 +385,7 @@@ OverrideTyp
  
  Location
  {
 -  /org/security.debian.org/ftp/pool/
 +  /srv/security-master.debian.org/ftp/pool/
      {
        Archive "security";
        Suites