X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=8a5ac8dea7d9c94eddb1f51506de3a53d6f0ea1a;hb=965f23a17180491622c2e4bc43f53433682973b4;hp=b7f5b13073545b50db794d97d875045a53a67bf4;hpb=9a82176a99868c8187c23314eec1af3132b05a95;p=dak.git

diff --git a/katie.conf b/katie.conf
index b7f5b130..8a5ac8de 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 "troup@auric.debian.org";
+   GroupOverrideFilename "override.group-maint";
 
 };
 
@@ -83,6 +90,19 @@ Jenna
 
 };
 
+Madison
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Suite "";
+    Version "";
+   };
+
+};
+
 Shania
 {
 
@@ -117,6 +137,7 @@ Natalie
    };
 
  ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
+ LockFile "natalie";
 };
 
 Melanie
@@ -129,6 +150,7 @@ Melanie
     Version "";
     Architecture "";
     Binary-Only "";
+    Carbon-Copy "";
     Component "";
     Done "";
     No-Action "";
@@ -140,6 +162,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 +184,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";
 };
@@ -198,13 +221,14 @@ Suite
 	  "sparc" "";
 	};
 	Announce "debian-devel-changes@lists.debian.org";
-	Version "xx";
 	Origin "Debian";
 	Description "Experimental packages - not released; use at your own risk.";
 	CodeName "experimental";
+	NotAutomatic "yes";
 	OverrideCodeName "sid";
 	OverrideSuite "unstable";
 	Priority "0";
+        Tree "project/experimental";
   };
 
   Stable
@@ -227,14 +251,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 +276,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";
@@ -280,9 +304,9 @@ Suite
 	  "powerpc" "";
 	  "sparc" "";
 	};
-	Version "2.3-testing";
 	Origin "Debian";
-	Description "Debian 2.3 Testing distribution - Not Released";
+	Description "Debian Testing distribution - Not Released";
+	CodeName "woody";
 	OverrideCodeName "woody";
 	Priority "3";
   };
@@ -314,9 +338,8 @@ Suite
 	  "sparc" "";
 	};
 	Announce "debian-devel-changes@lists.debian.org";
-	Version "2.3";
 	Origin "Debian";
-	Description "Debian 2.3 Unstable - Not Released";
+	Description "Debian Unstable - Not Released";
 	CodeName "sid";
 	OverrideCodeName "sid";
 	Priority "4";
@@ -328,6 +351,8 @@ 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/";
@@ -337,7 +362,8 @@ Dir
 
 DB
 {
-  Host "ftp-master.debian.org";
+  Name "projectb";
+  Host ""; 
   Port -1;
   ROUser "nobody";
 };
@@ -369,6 +395,7 @@ Archive
   ftp-master
   {
     OriginServer "ftp-master.debian.org";
+    PrimaryMirror "ftp.debian.org";
     Description "Master Archive for the Debian project";
   };