Add new top level directories

[dak.git] / katie.conf-security

diff --git a/katie.conf-security b/katie.conf-security
index c6a156e42e1da48f4d341a9c7907f107660bfdce..e5ef686800ade3e99aa19a0489f302aab235365b 100644 (file)
--- a/katie.conf-security
+++ b/katie.conf-security
@@ -4,7 +4,7 @@ Dinstall
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "1DB114E0";
+   SigningKeyIds "4F368D5D";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -15,18 +15,20 @@ Dinstall
    LockFile "/org/security.debian.org/katie/lock";
    Bcc "archive@ftp-master.debian.org";
    // GroupOverrideFilename "override.group-maint";
-   FutureTimeTravelGrace 28800; // 6 hours
+   FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 300;
    CloseBugs "false";
    OverrideDisparityCheck "false";
    BXANotify "false";
-   AcceptedAutoBuildSuites
+   QueueBuildSuites
    {
+     oldstable;
      stable;
      testing;
    };
-   SecurityAcceptedAutoBuild "true";     
+   SecurityQueueHandling "true";     
+   SecurityQueueBuild "true";     
    DefaultSuite "Testing";
    SuiteSuffix "updates";
    OverrideMaintainer "katie@security.debian.org";
@@ -80,7 +82,7 @@ Rhona
 {
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
-  AcceptedAutoBuildStayOfExecution 86400; // 24 hours
+  QueueBuildStayOfExecution 86400; // 24 hours
   MorgueSubDir "rhona";
   OverrideFilename "override.source-only";
 };
@@ -103,7 +105,7 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by charisma (highest wins).
 
-  Stable
+  Oldstable
   {
        Components 
        {
@@ -137,6 +139,41 @@ Suite
        CopyKatie "/org/security.debian.org/queue/done/";
   };
 
+  Stable
+  {
+       Components 
+       {
+         updates/main;
+         updates/contrib;
+         updates/non-free;
+       };
+       Architectures 
+       {
+         source;  
+         all;
+         alpha;
+         amd64; 
+         arm;
+         hppa;
+         i386;
+         ia64;
+         m68k;
+         mips;
+         mipsel;
+         powerpc;
+         s390;
+         sparc;
+       };
+       Announce "katie@security.debian.org";
+       Version "3.1";
+       Origin "Debian";
+       Label "Debian-Security";
+       Description "Debian 3.1 Security Updates";
+       CodeName "sarge";
+       OverrideCodeName "sarge";
+       CopyKatie "/org/security.debian.org/queue/done/";
+  };
+
   Testing
   {
        Components 
@@ -149,6 +186,7 @@ Suite
        {
          source;  
          all;
+         amd64; 
          alpha; 
          arm;
          hppa;
@@ -166,8 +204,8 @@ Suite
        Origin "Debian";
        Label "Debian-Security";
        Description "Debian x.y Security Updates";
-       CodeName "sarge";
-       OverrideCodeName "sarge";
+       CodeName "etch";
+       OverrideCodeName "etch";
        CopyKatie "/org/security.debian.org/queue/done/";
   };
 
@@ -175,10 +213,11 @@ Suite
 
 SuiteMappings
 {
+  "silent-map oldstable-security oldstable";
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
- "silent-map testing-security stable";
- //"silent-map testing-security testing";
+ // "silent-map testing-security stable";
+  "silent-map testing-security testing";
 };
 
 Dir
@@ -189,15 +228,15 @@ Dir
   Templates "/org/security.debian.org/katie/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/";
   Morgue "/org/security.debian.org/morgue/";
   MorgueReject "reject";
   Override "/org/security.debian.org/scripts/override/";
-  AcceptedAutoBuild "/org/security.debian.org/buildd/";
+  QueueBuild "/org/security.debian.org/buildd/";
   Queue
   {
-    Root "/org/security.debian.org/queue/";
     Accepted "/org/security.debian.org/queue/accepted/";
     Byhand "/org/security.debian.org/queue/byhand/";
     Done "/org/security.debian.org/queue/done/";
@@ -205,6 +244,10 @@ Dir
     New "/org/security.debian.org/queue/new/";
     Reject "/org/security.debian.org/queue/reject/";
     Unchecked "/org/security.debian.org/queue/unchecked/";
+
+    Embargoed "/org/security.debian.org/queue/embargoed/";
+    Unembargoed "/org/security.debian.org/queue/unembargoed/";
+    Disembargo "/org/security.debian.org/queue/unchecked-disembargo/";
   };
 };
 
@@ -232,6 +275,7 @@ Architectures
   powerpc "PowerPC";
   s390 "IBM S/390";
   sparc "Sun SPARC/UltraSPARC";
+  amd64 "AMD x86_64 (AMD64)";
 
 };
 
@@ -349,6 +393,7 @@ Location
       Archive "security";
       Suites 
        {
+         Oldstable;
          Stable;
          Testing;
         };