X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=fb219e5e52f0d46acce7a0e1a50d3731e56da675;hb=b6d163b9acb6a7c5ff29c741ebf12a2e9171d3b0;hp=b146c637badedc8fdb914e608d353b8eae2796f1;hpb=141673ae65e8160c78464c1eac1ecb615aedfc54;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index b146c637..fb219e5e 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";
@@ -14,6 +16,7 @@ Dinstall
    PackagesServer "packages.debian.org";
    LockFile "/org/security.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
+   // GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 300;
@@ -28,14 +31,14 @@ Dinstall
    };
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
-   DefaultSuite "Testing";
+   DefaultSuite "oldstable";
    SuiteSuffix "updates";
    OverrideMaintainer "dak@security.debian.org";
    StableDislocationSupport "false";
    LegacyStableHasNoSections "false";
 };
 
-Process-Unchecked
+Process-New
 {
   AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock";
 };
@@ -51,9 +54,9 @@ Queue-Report
 {
   Directories
   {
-    byhand;
-    new;
-    accepted;
+    // byhand;
+    // new;
+    unembargoed;
   };
 };
 
@@ -121,7 +124,8 @@ Suite
 	{
 	  source;  
 	  all;
-	  alpha; 
+	  alpha;
+	  amd64; 
 	  arm;
 	  hppa;
 	  i386;
@@ -134,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/";
   };
 
@@ -155,13 +159,12 @@ Suite
 	{
 	  source;  
 	  all;
-	  alpha;
 	  amd64; 
+	  alpha; 
 	  arm;
 	  hppa;
 	  i386;
 	  ia64;
-	  m68k;
 	  mips;
 	  mipsel;
 	  powerpc;
@@ -169,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/";
   };
 
@@ -196,7 +199,6 @@ Suite
 	  hppa;
 	  i386;
 	  ia64;
-	  m68k;
 	  mips;
 	  mipsel;
 	  powerpc;
@@ -208,11 +210,10 @@ Suite
 	Origin "Debian";
 	Label "Debian-Security";
 	Description "Debian testing Security Updates";
-	CodeName "etch";
-	OverrideCodeName "etch";
+	CodeName "lenny";
+	OverrideCodeName "lenny";
 	CopyDotDak "/org/security.debian.org/queue/done/";
   };
-
 };
 
 SuiteMappings
@@ -221,7 +222,7 @@ SuiteMappings
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
-  "silent-map etch-secure testing";
+  "silent-map etch-secure stable";
   "silent-map testing-security testing";
 };
 
@@ -249,6 +250,7 @@ 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
 
     Embargoed "/org/security.debian.org/queue/embargoed/";
     Unembargoed "/org/security.debian.org/queue/unembargoed/";