X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=fb92741aa02265b78d764d94d17d0aaeae2f5eaf;hb=4a267a9e31e7ae7c08189e5d23944d569da4116c;hp=dd3564d19746980f2983ae8d44ac01ec19ffddf1;hpb=17cec6a95a357324d0292155242310aed6757ebf;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index dd3564d1..fb92741a 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 "4F368D5D";
+   SigningKeyIds "6070D3A1";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -29,13 +31,18 @@ Dinstall
    };
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
-   DefaultSuite "Testing";
+   DefaultSuite "oldstable";
    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 +54,9 @@ Queue-Report
 {
   Directories
   {
-    byhand;
-    new;
-    accepted;
+    // byhand;
+    // new;
+    unembargoed;
   };
 };
 
@@ -117,7 +124,8 @@ Suite
 	{
 	  source;  
 	  all;
-	  alpha; 
+	  alpha;
+	  amd64; 
 	  arm;
 	  hppa;
 	  i386;
@@ -130,12 +138,12 @@ Suite
 	  sparc;
 	};
 	Announce "dak@security.debian.org";
-	Version "3.0";
+	Version "3.1";
 	Origin "Debian";
 	Label "Debian-Security";
-	Description "Debian 3.0 Security Updates";
-	CodeName "woody";
-	OverrideCodeName "woody";
+	Description "Debian 3.1 Security Updates";
+	CodeName "sarge";
+	OverrideCodeName "sarge";
 	CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
@@ -151,13 +159,12 @@ Suite
 	{
 	  source;  
 	  all;
-	  alpha;
 	  amd64; 
+	  alpha; 
 	  arm;
 	  hppa;
 	  i386;
 	  ia64;
-	  m68k;
 	  mips;
 	  mipsel;
 	  powerpc;
@@ -165,12 +172,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/";
   };
 
@@ -192,7 +199,6 @@ Suite
 	  hppa;
 	  i386;
 	  ia64;
-	  m68k;
 	  mips;
 	  mipsel;
 	  powerpc;
@@ -200,15 +206,14 @@ 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
@@ -217,6 +222,7 @@ SuiteMappings
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
+  "silent-map etch-secure stable";
   "silent-map testing-security testing";
 };
 
@@ -244,6 +250,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/";