Merge from security

[dak.git] / config / debian-security / dak.conf

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index e5ef686800ade3e99aa19a0489f302aab235365b..bc978ee20a413e4f638955203f4c91bb48ce760b 100644 (file)
--- 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";
@@ -12,7 +14,7 @@ Dinstall
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
-   LockFile "/org/security.debian.org/katie/lock";
+   LockFile "/org/security.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
    // GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
@@ -29,40 +31,45 @@ Dinstall
    };
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
-   DefaultSuite "Testing";
+   DefaultSuite "oldstable";
    SuiteSuffix "updates";
-   OverrideMaintainer "katie@security.debian.org";
+   OverrideMaintainer "dak@security.debian.org";
    StableDislocationSupport "false";
    LegacyStableHasNoSections "false";
 };
 
-Julia
+Process-New
+{
+  AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock";
+};
+
+Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,katie,www-data,udmsearch";
+  KnownPostgres "postgres,dak,www-data,udmsearch";
 };
 
-Helena
+Queue-Report
 {
   Directories
   {
-    byhand;
-    new;
-    accepted;
+    // byhand;
+    // new;
+    unembargoed;
   };
 };
 
-Shania
+Clean-Queues
 {
   Options
   {
     Days 14;
   };
- MorgueSubDir "shania";
+ MorgueSubDir "queue";
 };
 
-Melanie
+Rm
 {
   Options
   {
@@ -70,24 +77,24 @@ Melanie
   };
 
   MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-  LogFile "/org/security.debian.org/katie-log/removals.txt";
+  LogFile "/org/security.debian.org/dak-log/removals.txt";
 };
 
-Neve
+Init-Archive
 {
-  ExportDir "/org/security.debian.org/katie/neve-files/";
+  ExportDir "/org/security.debian.org/dak/import-archive-files/";
 };
 
-Rhona
+Clean-Suites
 {
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
   QueueBuildStayOfExecution 86400; // 24 hours
-  MorgueSubDir "rhona";
+  MorgueSubDir "pool";
   OverrideFilename "override.source-only";
 };
 
-Amber
+Security-Install
 {
   ComponentMappings
   {
@@ -103,7 +110,7 @@ Amber
 Suite
 {
   // Priority determines which suite is used for the Maintainers file
-  // as generated by charisma (highest wins).
+  // as generated by 'dak make-maintainers' (highest wins).
 
   Oldstable
   {
@@ -117,7 +124,8 @@ Suite
        {
          source;  
          all;
-         alpha; 
+         alpha;
+         amd64; 
          arm;
          hppa;
          i386;
@@ -129,14 +137,14 @@ Suite
          s390;
          sparc;
        };
-       Announce "katie@security.debian.org";
-       Version "3.0";
+       Announce "dak@security.debian.org";
+       Version "3.1";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian 3.0 Security Updates";
-       CodeName "woody";
-       OverrideCodeName "woody";
-       CopyKatie "/org/security.debian.org/queue/done/";
+       Description "Debian 3.1 Security Updates";
+       CodeName "sarge";
+       OverrideCodeName "sarge";
+       CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
   Stable
@@ -151,27 +159,26 @@ Suite
        {
          source;  
          all;
-         alpha;
          amd64; 
+         alpha; 
          arm;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
          s390;
          sparc;
        };
-       Announce "katie@security.debian.org";
-       Version "3.1";
+       Announce "dak@security.debian.org";
+       Version "";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian 3.1 Security Updates";
-       CodeName "sarge";
-       OverrideCodeName "sarge";
-       CopyKatie "/org/security.debian.org/queue/done/";
+       Description "Debian 4.0 Security Updates";
+       CodeName "etch";
+       OverrideCodeName "etch";
+       CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
   Testing
@@ -189,26 +196,25 @@ Suite
          amd64; 
          alpha; 
          arm;
+         armel;
          hppa;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
          s390;
          sparc;
        };
-       Announce "katie@security.debian.org";
-       Version "x.y";
+       Announce "dak@security.debian.org";
+       Version "";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian x.y Security Updates";
-       CodeName "etch";
-       OverrideCodeName "etch";
-       CopyKatie "/org/security.debian.org/queue/done/";
+       Description "Debian testing Security Updates";
+       CodeName "lenny";
+       OverrideCodeName "lenny";
+       CopyDotDak "/org/security.debian.org/queue/done/";
   };
-
 };
 
 SuiteMappings
@@ -217,6 +223,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";
 };
 
@@ -224,13 +231,13 @@ Dir
 {
   Root "/org/security.debian.org/ftp/";
   Pool "/org/security.debian.org/ftp/pool/";
-  Katie "/org/security.debian.org/katie/";
-  Templates "/org/security.debian.org/katie/templates/";
+  Dak "/org/security.debian.org/dak/";
+  Templates "/org/security.debian.org/dak/templates/";
   PoolRoot "pool/";
   Override "/org/security.debian.org/override/";
   Lock "/org/security.debian.org/lock/";
-  Lists "/org/security.debian.org/katie-database/dists/";
-  Log "/org/security.debian.org/katie-log/";
+  Lists "/org/security.debian.org/dak-database/dists/";
+  Log "/org/security.debian.org/dak-log/";
   Morgue "/org/security.debian.org/morgue/";
   MorgueReject "reject";
   Override "/org/security.debian.org/scripts/override/";
@@ -244,6 +251,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 +276,7 @@ Architectures
   alpha "DEC Alpha";
   hppa "HP PA RISC";
   arm "ARM";
+  armel "ARM EABI";
   i386 "Intel ia32";
   ia64 "Intel ia64";
   m68k "Motorola Mc680x0";