]> git.decadent.org.uk Git - dak.git/blobdiff - config/debian-security/dak.conf
Merge branch 'typofix'
[dak.git] / config / debian-security / dak.conf
index e5ef686800ade3e99aa19a0489f302aab235365b..0f77a7f49e61b9286f13890a8932d36d8bda4318 100644 (file)
@@ -1,10 +1,11 @@
 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";
+   };
    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 "55BE302B";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -12,7 +13,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 +30,45 @@ Dinstall
    };
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
-   DefaultSuite "Testing";
+   DefaultSuite "stable";
    SuiteSuffix "updates";
-   OverrideMaintainer "katie@security.debian.org";
-   StableDislocationSupport "false";
+   OverrideMaintainer "dak@security.debian.org";
    LegacyStableHasNoSections "false";
 };
 
-Julia
+Process-New
+{
+  AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock";
+  LockDir "/srv/security-master.debian.org/lock/new/";
+};
+
+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 +76,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,9 +109,9 @@ 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
+  OldStable
   {
        Components 
        {
@@ -113,30 +119,15 @@ Suite
          updates/contrib;
          updates/non-free;
        };
-       Architectures 
-       {
-         source;  
-         all;
-         alpha; 
-         arm;
-         hppa;
-         i386;
-         ia64;
-         m68k;
-         mips;
-         mipsel;
-         powerpc;
-         s390;
-         sparc;
-       };
-       Announce "katie@security.debian.org";
-       Version "3.0";
+       Announce "dak@security.debian.org";
+       Version "";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian 3.0 Security Updates";
-       CodeName "woody";
-       OverrideCodeName "woody";
-       CopyKatie "/org/security.debian.org/queue/done/";
+       Description "Debian 4.0 Security Updates";
+       ValidTime 864000; // 10 days
+       CodeName "etch";
+       OverrideCodeName "etch";
+       CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
   Stable
@@ -147,76 +138,45 @@ Suite
          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";
+       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 5.0 Security Updates";
+       ValidTime 864000; // 10 days
+       CodeName "lenny";
+       OverrideCodeName "lenny";
+       CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
   Testing
   {
-       Components 
+       Components
        {
          updates/main;
          updates/contrib;
          updates/non-free;
        };
-       Architectures 
-       {
-         source;  
-         all;
-         amd64; 
-         alpha; 
-         arm;
-         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";
+       ValidTime 864000; // 10 days
+       CodeName "squeeze";
+       OverrideCodeName "squeeze";
+       CopyDotDak "/org/security.debian.org/queue/done/";
   };
-
 };
 
 SuiteMappings
 {
-  "silent-map oldstable-security oldstable";
  "silent-map stable-security stable";
+ "silent-map oldstable-security oldstable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
+  "silent-map etch-secure oldstable";
+  "silent-map lenny-secure stable";
   "silent-map testing-security testing";
 };
 
@@ -224,17 +184,18 @@ 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/";
   QueueBuild "/org/security.debian.org/buildd/";
+  Upload "/srv/queued/UploadQueue/";
   Queue
   {
     Accepted "/org/security.debian.org/queue/accepted/";
@@ -244,6 +205,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,9 +230,9 @@ Architectures
   alpha "DEC Alpha";
   hppa "HP PA RISC";
   arm "ARM";
+  armel "ARM EABI";
   i386 "Intel ia32";
   ia64 "Intel ia64";
-  m68k "Motorola Mc680x0";
   mips "MIPS (Big Endian)";
   mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";
@@ -327,31 +290,45 @@ ComponentMappings
 Section
 {
   admin;
-  base;
+  cli-mono;
   comm;
+  database;
   debian-installer;
+  debug;
   devel;
   doc;
   editors;
-  electronics;
   embedded;
+  electronics;
+  fonts;
   games;
   gnome;
   graphics;
+  gnu-r;
+  gnustep;
   hamradio;
+  haskell;
+  httpd;
   interpreters;
+  java;
   kde;
+  kernel;
   libdevel;
   libs;
+  lisp;
+  localization;
   mail;
   math;
   misc;
   net;
   news;
+  ocaml;
   oldlibs;
   otherosfs;
   perl;
+  php;
   python;
+  ruby;
   science;
   shells;
   sound;
@@ -359,8 +336,11 @@ Section
   text;
   utils;
   web;
+  vcs;
+  video;
   x11;
-  non-US;
+  xfce;
+  zope;
 };
 
 Priority
@@ -382,18 +362,12 @@ OverrideType
 
 Location
 {
-  /org/security.debian.org/ftp/dists/
-    {
-      Archive "security";
-      Type "legacy";
-    };
-
   /org/security.debian.org/ftp/pool/
     {
       Archive "security";
       Suites 
        {
-         Oldstable;
+         OldStable;
          Stable;
          Testing;
         };