Add new scripts; remove old ones.

[dak.git] / katie.conf

diff --git a/katie.conf b/katie.conf
index 40d39c6ae86c146a039c15f76da4e3aa9a0caa2a..bcb175e53fa6cc070e802a51b4dfe8fdd2df455f 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -20,8 +20,8 @@ Dinstall
    SendmailCommand "/usr/sbin/sendmail -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
-   NewAckList "/home/troup/katie/log"; // !!FIXME!!
-   LockFile "/home/troup/katie/lock"; // !!FIXME!!
+   NewAckList "/org/ftp.debian.org/katie/log";
+   LockFile "/org/ftp.debian.org/katie/lock";
 
 };
 
@@ -57,28 +57,46 @@ Jenna
 
 };
 
+Shania
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Version "";
+    Days 14;
+    Incoming "";
+    Mail "";
+    No-Action "";
+    Verbose "";
+   };
+
+ MorgueSubDir "shania";
+};
+
 Neve
 {
 
-  ExportDir "/home/troup/katie/neve-files/";
+  ExportDir "/org/ftp.debian.org/katie/neve-files/";
 
 };
 
 Rhona
 {
 
-  Options  // Currently don't do anything
+  Options
   {
         Debug "";
         Help "";
-       Interactive "";
+       No-Action "";
         Version "";
    };
 
-  //Morgue "/org/ftp.debian.org/morgue/";
-   Morgue "/org/scratch/troup/morgue/";
-   // How long (in seconds) dead packages are left before being killed
-   StayOfExecution 259200;
+  // How long (in seconds) dead packages are left before being killed
+  StayOfExecution 172800; // 2 days
+  MorgueSubDir "rhona";
+  OverrideFilename "override.source-only";
 };
 
 Suite
@@ -129,13 +147,14 @@ Suite
          "sparc" "";
        };
        Announce "debian-changes@lists.debian.org";
-       Version "2.2r0";
+       Version "2.2r2";
        Origin "Debian";
-       Description "Debian 2.2 Released 14th August 2000";
+       Description "Debian 2.2r2 Released 5th December 2000";
        CodeName "potato";
        OverrideCodeName "potato";
        Priority "1";
        Untouchable "1";
+       ChangeLogBase "dists/stable/non-US/";
   };
 
   Proposed-Updates
@@ -153,9 +172,9 @@ Suite
        };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
-       Version "2.2r1";
+       Version "2.2r3";
        Origin "Debian";
-       Description "Proposed Updates for Debian 2.2r1 - Not Released";
+       Description "Proposed Updates for Debian 2.2r3 - Not Released";
        CodeName "proposed-updates";
        OverrideCodeName "potato";
        Priority "2";
@@ -224,11 +243,12 @@ Suite
 Dir
 {
   RootDir "/org/ftp.debian.org/ftp/";
-  PoolDir "/org/scratch/troup/pool/";
+  PoolDir "/org/ftp.debian.org/ftp/pool/";
   PoolRoot "pool/";
   IncomingDir "/org/ftp.debian.org/incoming/";
   OverrideDir "/org/ftp.debian.org/scripts/override/";
   ListsDir "/org/ftp.debian.org/database/dists/";
+  Morgue "/org/ftp.debian.org/morgue/";
 };
 
 DB
@@ -236,7 +256,7 @@ DB
   Host "ftp-master.debian.org";
   Port -1;
   ROUser "nobody";
-}
+};
 
 Architectures
 {
@@ -322,10 +342,10 @@ Location
     };
 
   // New pool locations on ftp-master.debian.org
-  /org/scratch/troup/pool/
+  /org/ftp.debian.org/ftp/pool/
     {
       Archive "ftp-master";
       Type "pool"
     };
 
-}
+};