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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 31cd3de2..5e3cce9d 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -2,14 +2,13 @@ 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";
    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>";
+   MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
    MyDistribution "Debian"; // Used in emails
@@ -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";
+    };
+
   };
 };
 
@@ -124,16 +162,16 @@ Suite
 	Version "";
 	Origin "Debian";
 	Label "Debian-Security";
-	Description "Debian 4.0 Security Updates";
+	Description "Debian 5.0 Security Updates";
 	ValidTime 864000; // 10 days
-	CodeName "etch";
-	OverrideCodeName "etch";
+	CodeName "lenny";
+	OverrideCodeName "lenny";
 	CopyDotDak "/srv/security-master.debian.org/queue/done/";
   };
 
   Stable
   {
-	Components 
+	Components
 	{
 	  updates/main;
 	  updates/contrib;
@@ -143,10 +181,10 @@ Suite
 	Version "";
 	Origin "Debian";
 	Label "Debian-Security";
-	Description "Debian 5.0 Security Updates";
+	Description "Debian 6.0 Security Updates";
 	ValidTime 864000; // 10 days
-	CodeName "lenny";
-	OverrideCodeName "lenny";
+	CodeName "squeeze";
+	OverrideCodeName "squeeze";
 	CopyDotDak "/srv/security-master.debian.org/queue/done/";
   };
 
@@ -164,8 +202,8 @@ Suite
 	Label "Debian-Security";
 	Description "Debian testing Security Updates";
 	ValidTime 864000; // 10 days
-	CodeName "squeeze";
-	OverrideCodeName "squeeze";
+	CodeName "wheezy";
+	OverrideCodeName "wheezy";
 	CopyDotDak "/srv/security-master.debian.org/queue/done/";
   };
 };
@@ -190,6 +228,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,15 +238,16 @@ 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/";
-    ProposedUpdates "/does/not/exist/"; // XXX fixme
-    OldProposedUpdates "/does/not/exist/"; // XXX fixme
+    Newstage "/srv/security-master.debian.org/queue/newstage/";
+
+    ProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme
+    OldProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme
 
     Embargoed "/srv/security-master.debian.org/queue/embargoed/";
     Unembargoed "/srv/security-master.debian.org/queue/unembargoed/";