X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=katie.conf;h=4bc4ab7af6565cc09516b13ebc0a87d9cbc080a7;hb=5cc6781082590fdccfa0e2835808a2a0039d60ec;hp=e01571cc7466625eb34a0ec2c545035d392f698c;hpb=0ae0a3896e77f8e07a43d2a8b368466f4edabedd;p=dak.git

diff --git a/katie.conf b/katie.conf
index e01571cc..4bc4ab7a 100644
--- a/katie.conf
+++ b/katie.conf
@@ -19,9 +19,14 @@ 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 "troup@auric.debian.org";
 
 };
 
@@ -84,6 +89,19 @@ Jenna
 
 };
 
+Madison
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Suite "";
+    Version "";
+   };
+
+};
+
 Shania
 {
 
@@ -130,6 +148,7 @@ Melanie
     Version "";
     Architecture "";
     Binary-Only "";
+    Carbon-Copy "";
     Component "";
     Done "";
     No-Action "";
@@ -141,6 +160,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
@@ -328,6 +348,7 @@ Dir
 {
   RootDir "/org/ftp.debian.org/ftp/";
   PoolDir "/org/ftp.debian.org/ftp/pool/";
+  TemplatesDir "/org/ftp.debian.org/katie/templates/";
   PoolRoot "pool/";
   IncomingDir "/org/ftp.debian.org/incoming/";
   OverrideDir "/org/ftp.debian.org/scripts/override/";
@@ -338,7 +359,7 @@ Dir
 DB
 {
   Name "projectb";
-  Host "ftp-master.debian.org";
+  Host ""; 
   Port -1;
   ROUser "nobody";
 };
@@ -370,6 +391,7 @@ Archive
   ftp-master
   {
     OriginServer "ftp-master.debian.org";
+    PrimaryMirror "ftp.debian.org";
     Description "Master Archive for the Debian project";
   };