X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=04383af3b76234931d5710fc77fd71d0170d20f1;hb=89ada75793da6403e6ceb74a66a119621f19bba4;hp=302d0fbb0b1fc4dd7e26d7d8887bef3ab188ab11;hpb=15046787dd73ccc528fbae8a89bdec63507f2bb9;p=dak.git

diff --git a/katie.conf b/katie.conf
index 302d0fbb..04383af3 100644
--- a/katie.conf
+++ b/katie.conf
@@ -19,9 +19,15 @@ Dinstall
    SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SendmailCommand "/usr/sbin/sendmail -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
+   MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
+   MyDistribution "Debian"; // Used in emails
+   BugServer "bugs.debian.org";
+   PackagesServer "packages.debian.org";
    NewAckList "/org/ftp.debian.org/katie/log";
    LockFile "/org/ftp.debian.org/katie/lock";
+   Bcc "archive@ftp-master.debian.org";
+   GroupOverrideFilename "override.group-maint";
 
 };
 
@@ -84,6 +90,21 @@ Jenna
 
 };
 
+Madison
+{
+
+  Options
+  {
+    Architecture "";
+    Debug "";
+    Help "";
+    Maintainer "";
+    Suite "";
+    Version "";
+   };
+
+};
+
 Shania
 {
 
@@ -118,6 +139,7 @@ Natalie
    };
 
  ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
+ LockFile "natalie";
 };
 
 Melanie
@@ -130,6 +152,7 @@ Melanie
     Version "";
     Architecture "";
     Binary-Only "";
+    Carbon-Copy "";
     Component "";
     Done "";
     No-Action "";
@@ -141,6 +164,7 @@ Melanie
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
    LogFile "/org/ftp.debian.org/web/removals.txt";
+   Bcc "removed-packages@qa.debian.org";
 };
 
 Neve
@@ -162,7 +186,7 @@ Rhona
    };
 
   // How long (in seconds) dead packages are left before being killed
-  StayOfExecution 172800; // 2 days
+  StayOfExecution 129600; // 1.5 days
   MorgueSubDir "rhona";
   OverrideFilename "override.source-only";
 };
@@ -202,6 +226,7 @@ Suite
 	Origin "Debian";
 	Description "Experimental packages - not released; use at your own risk.";
 	CodeName "experimental";
+	NotAutomatic "yes";
 	OverrideCodeName "sid";
 	OverrideSuite "unstable";
 	Priority "0";
@@ -228,14 +253,14 @@ Suite
 	  "sparc" "";
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "2.2r2";
+	Version "2.2r3";
 	Origin "Debian";
-	Description "Debian 2.2r2 Released 5th December 2000";
+	Description "Debian 2.2r3 Released 16th April 2001";
 	CodeName "potato";
 	OverrideCodeName "potato";
 	Priority "1";
 	Untouchable "1";
-	ChangeLogBase "dists/stable/non-US/";
+	ChangeLogBase "dists/stable/";
   };
 
   Proposed-Updates
@@ -253,9 +278,9 @@ Suite
 	};
 	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/proposed-updates/";
-	Version "2.2r3";
+	Version "2.2r4";
 	Origin "Debian";
-	Description "Proposed Updates for Debian 2.2r3 - Not Released";
+	Description "Proposed Updates for Debian 2.2r4 - Not Released";
 	CodeName "proposed-updates";
 	OverrideCodeName "potato";
 	OverrideSuite "stable";
@@ -276,7 +301,9 @@ Suite
 	  "all" "";
 	  "alpha" ""; 
 	  "arm" "";
+	  "hppa" "";
 	  "i386" "";
+	  "ia64" "";
 	  "m68k" "";
 	  "powerpc" "";
 	  "sparc" "";
@@ -288,6 +315,34 @@ Suite
 	Priority "3";
   };
 
+  Woody-Proposed-Updates
+  {
+	Components 
+	{
+	  main "";
+	  contrib "";
+	  non-free "";
+	};
+	Architectures 
+	{
+	  "source" "";  
+	  "all" "";
+	  "alpha" ""; 
+	  "arm" "";
+	  "hppa" "";
+	  "i386" "";
+	  "ia64" "";
+	  "m68k" "";
+	  "powerpc" "";
+	  "sparc" "";
+	};
+	Origin "Debian";
+	Description "Debian Testing distribution updates - Not Released";
+	CodeName "woody-proposed-updates";
+	OverrideCodeName "woody";
+	Priority "4";
+  };
+
   Unstable
   {
 	Components 
@@ -319,7 +374,7 @@ Suite
 	Description "Debian Unstable - Not Released";
 	CodeName "sid";
 	OverrideCodeName "sid";
-	Priority "4";
+	Priority "5";
   };
 
 };
@@ -328,18 +383,21 @@ Dir
 {
   RootDir "/org/ftp.debian.org/ftp/";
   PoolDir "/org/ftp.debian.org/ftp/pool/";
+  TemplatesDir "/org/ftp.debian.org/katie/templates/";
+  LockDir "/org/ftp.debian.org/katie/locks/";
   PoolRoot "pool/";
   IncomingDir "/org/ftp.debian.org/incoming/";
   OverrideDir "/org/ftp.debian.org/scripts/override/";
   ListsDir "/org/ftp.debian.org/database/dists/";
+  LogDir "/org/ftp.debian.org/log/";
   Morgue "/org/ftp.debian.org/morgue/";
 };
 
 DB
 {
-  Host "ftp-master.debian.org";
+  Name "projectb";
+  Host ""; 
   Port -1;
-  ROUser "nobody";
 };
 
 Architectures
@@ -369,6 +427,7 @@ Archive
   ftp-master
   {
     OriginServer "ftp-master.debian.org";
+    PrimaryMirror "ftp.debian.org";
     Description "Master Archive for the Debian project";
   };