X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config%2Fdebian-security%2Fdak.conf;h=68216d57831955a6797c3e6c36b136eb18666079;hb=3c2b932e8e034c8f314537231e14f62e7e61537c;hp=7e5e1d97c05c9bfc8d1dbe388e9af2f923cd9cd2;hpb=25d1dfb689b3f215a9c42073ffeb1b64c535f79b;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 7e5e1d97..68216d57 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -1,10 +1,12 @@
 Dinstall
 {
-   PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
-   GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+   GPGKeyring {
+     "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+     "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
+   };
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "2D230C5F";
+   SigningKeyIds "6070D3A1";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -23,19 +25,23 @@ Dinstall
    BXANotify "false";
    QueueBuildSuites
    {
-     oldstable;
      stable;
      testing;
    };
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
-   DefaultSuite "Testing";
+   DefaultSuite "stable";
    SuiteSuffix "updates";
    OverrideMaintainer "dak@security.debian.org";
    StableDislocationSupport "false";
    LegacyStableHasNoSections "false";
 };
 
+Process-New
+{
+  AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock";
+};
+
 Import-Users-From-Passwd
 {
   ValidGID "800";
@@ -47,9 +53,9 @@ Queue-Report
 {
   Directories
   {
-    byhand;
-    new;
-    accepted;
+    // byhand;
+    // new;
+    unembargoed;
   };
 };
 
@@ -105,40 +111,6 @@ Suite
   // 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;
-	};
-	Architectures 
-	{
-	  source;  
-	  all;
-	  alpha; 
-	  arm;
-	  hppa;
-	  i386;
-	  ia64;
-	  m68k;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
-	Announce "dak@security.debian.org";
-	Version "3.0";
-	Origin "Debian";
-	Label "Debian-Security";
-	Description "Debian 3.0 Security Updates";
-	CodeName "woody";
-	OverrideCodeName "woody";
-	CopyDotDak "/org/security.debian.org/queue/done/";
-  };
-
   Stable
   {
 	Components 
@@ -151,13 +123,12 @@ Suite
 	{
 	  source;  
 	  all;
-	  alpha;
 	  amd64; 
+	  alpha; 
 	  arm;
 	  hppa;
 	  i386;
 	  ia64;
-	  m68k;
 	  mips;
 	  mipsel;
 	  powerpc;
@@ -165,12 +136,12 @@ Suite
 	  sparc;
 	};
 	Announce "dak@security.debian.org";
-	Version "3.1";
+	Version "";
 	Origin "Debian";
 	Label "Debian-Security";
-	Description "Debian 3.1 Security Updates";
-	CodeName "sarge";
-	OverrideCodeName "sarge";
+	Description "Debian 4.0 Security Updates";
+	CodeName "etch";
+	OverrideCodeName "etch";
 	CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
@@ -189,10 +160,10 @@ Suite
 	  amd64; 
 	  alpha; 
 	  arm;
+	  armel;
 	  hppa;
 	  i386;
 	  ia64;
-	  m68k;
 	  mips;
 	  mipsel;
 	  powerpc;
@@ -200,23 +171,22 @@ Suite
 	  sparc;
 	};
 	Announce "dak@security.debian.org";
-	Version "x.y";
+	Version "";
 	Origin "Debian";
 	Label "Debian-Security";
-	Description "Debian x.y Security Updates";
-	CodeName "etch";
-	OverrideCodeName "etch";
+	Description "Debian testing Security Updates";
+	CodeName "lenny";
+	OverrideCodeName "lenny";
 	CopyDotDak "/org/security.debian.org/queue/done/";
   };
-
 };
 
 SuiteMappings
 {
-  "silent-map oldstable-security oldstable";
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
+  "silent-map etch-secure stable";
   "silent-map testing-security testing";
 };
 
@@ -235,6 +205,7 @@ Dir
   MorgueReject "reject";
   Override "/org/security.debian.org/scripts/override/";
   QueueBuild "/org/security.debian.org/buildd/";
+  Upload "/srv/queued/UploadQueue/";
   Queue
   {
     Accepted "/org/security.debian.org/queue/accepted/";
@@ -244,6 +215,8 @@ Dir
     New "/org/security.debian.org/queue/new/";
     Reject "/org/security.debian.org/queue/reject/";
     Unchecked "/org/security.debian.org/queue/unchecked/";
+    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/";
@@ -267,6 +240,7 @@ Architectures
   alpha "DEC Alpha";
   hppa "HP PA RISC";
   arm "ARM";
+  armel "ARM EABI";
   i386 "Intel ia32";
   ia64 "Intel ia64";
   m68k "Motorola Mc680x0";
@@ -393,7 +367,6 @@ Location
       Archive "security";
       Suites 
 	{
-	  Oldstable;
 	  Stable;
 	  Testing;
         };