X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=a517b0ed6eca30a59cdb8560259e6982a9d308e7;hb=2640ce213afbd93f01d6cab41d903db852b7f5bf;hp=32d5ce2b0d4ef968e8fedccb4e987de1718e3ae5;hpb=e4f2f33a24646716adedd63afa87a672cd6ed599;p=dak.git

diff --git a/katie.conf b/katie.conf
index 32d5ce2b..a517b0ed 100644
--- a/katie.conf
+++ b/katie.conf
@@ -16,11 +16,18 @@ Dinstall
 
    PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+   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";
 
 };
 
@@ -83,6 +90,40 @@ Jenna
 
 };
 
+Madison
+{
+
+  Options
+  {
+    Architecture "";
+    Debug "";
+    Help "";
+    Maintainer "";
+    Suite "";
+    Version "";
+   };
+
+};
+
+Julia
+{
+
+  Options
+  {
+    Quiet "";
+    Verbose "";
+    Debug "";
+    Help "";
+    Version "";
+   };
+
+  ValidGID "800";
+  // Comma seperated list of users who are in Postgres but not the passwd file
+  KnownPostgres "postgres,katie";
+    
+
+};
+
 Shania
 {
 
@@ -117,6 +158,7 @@ Natalie
    };
 
  ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
+ LockFile "natalie";
 };
 
 Melanie
@@ -129,6 +171,7 @@ Melanie
     Version "";
     Architecture "";
     Binary-Only "";
+    Carbon-Copy "";
     Component "";
     Done "";
     No-Action "";
@@ -140,6 +183,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
@@ -161,7 +205,7 @@ Rhona
    };
 
   // How long (in seconds) dead packages are left before being killed
-  StayOfExecution 0; // 0 days
+  StayOfExecution 129600; // 1.5 days
   MorgueSubDir "rhona";
   OverrideFilename "override.source-only";
 };
@@ -201,6 +245,7 @@ Suite
 	Origin "Debian";
 	Description "Experimental packages - not released; use at your own risk.";
 	CodeName "experimental";
+	NotAutomatic "yes";
 	OverrideCodeName "sid";
 	OverrideSuite "unstable";
 	Priority "0";
@@ -227,14 +272,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
@@ -252,9 +297,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";
@@ -275,17 +320,48 @@ Suite
 	  "all" "";
 	  "alpha" ""; 
 	  "arm" "";
+	  "hppa" "";
 	  "i386" "";
+	  "ia64" "";
 	  "m68k" "";
 	  "powerpc" "";
 	  "sparc" "";
 	};
 	Origin "Debian";
 	Description "Debian Testing distribution - Not Released";
+	CodeName "woody";
 	OverrideCodeName "woody";
 	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 
@@ -317,7 +393,7 @@ Suite
 	Description "Debian Unstable - Not Released";
 	CodeName "sid";
 	OverrideCodeName "sid";
-	Priority "4";
+	Priority "5";
   };
 
 };
@@ -326,18 +402,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
@@ -367,6 +446,7 @@ Archive
   ftp-master
   {
     OriginServer "ftp-master.debian.org";
+    PrimaryMirror "ftp.debian.org";
     Description "Master Archive for the Debian project";
   };