2004-02-27 Martin Michlmayr <tbm@cyrius.com> * docs/README.config: lots of updates...

[dak.git] / katie.conf-security

diff --git a/katie.conf-security b/katie.conf-security
index 7d67b25c4c086c97994696ab590dac09889b0e83..cb4b37d5d777696e2fc89acba09e3afacf7f9676 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 "722F1AED";
+   SigningKeyIds "1DB114E0";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -15,7 +15,7 @@ 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";
@@ -23,7 +23,6 @@ Dinstall
    BXANotify "false";
    AcceptedAutoBuildSuites
    {
-     oldstable;
      stable;
      testing;
    };
@@ -38,8 +37,18 @@ Dinstall
 Julia
 {
   ValidGID "800";
-  // Comma seperated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,katie";
+  // Comma separated list of users who are in Postgres but not the passwd file
+  KnownPostgres "postgres,katie,www-data,udmsearch";
+};
+
+Helena
+{
+  Directories
+  {
+    byhand;
+    new;
+    accepted;
+  };
 };
 
 Shania
@@ -47,7 +56,7 @@ Shania
   Options
   {
     Days 14;
-   };
+  };
  MorgueSubDir "shania";
 };
 
@@ -56,10 +65,10 @@ Melanie
   Options
   {
     Suite "unstable";
-   };
+  };
 
-   MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-   LogFile "/org/security.debian.org/katie-log/removals.txt";
+  MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
+  LogFile "/org/security.debian.org/katie-log/removals.txt";
 };
 
 Neve
@@ -94,35 +103,6 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by charisma (highest wins).
 
-  OldStable
-  {
-       Components 
-       {
-         updates/main;
-         updates/contrib;
-         updates/non-free;
-       };
-       Architectures 
-       {
-         source;  
-         all;
-         alpha; 
-         arm;
-         i386;
-         m68k;
-         powerpc;
-         sparc;
-       };
-       Announce "katie@security.debian.org";
-       Version "2.2";
-       Origin "Debian";
-       Label "Debian-Security";
-       Description "Debian 2.2 Security Updates";
-       CodeName "potato";
-       OverrideCodeName "potato";
-       CopyKatie "/org/security.debian.org/queue/done/";
-  };
-
   Stable
   {
        Components 
@@ -195,7 +175,6 @@ Suite
 
 SuiteMappings
 {
- "silent-map oldstable-security oldstable";
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
  "silent-map testing-security stable";
@@ -218,7 +197,6 @@ Dir
   AcceptedAutoBuild "/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/";
@@ -311,10 +289,14 @@ Section
   doc;
   editors;
   electronics;
+  embedded;
   games;
+  gnome;
   graphics;
   hamradio;
   interpreters;
+  kde;
+  libdevel;
   libs;
   mail;
   math;
@@ -323,6 +305,8 @@ Section
   news;
   oldlibs;
   otherosfs;
+  perl;
+  python;
   science;
   shells;
   sound;
@@ -364,7 +348,6 @@ Location
       Archive "security";
       Suites 
        {
-         OldStable;
          Stable;
          Testing;
         };