X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=ccd32f59eb51c3af41b6c92786a1344d85629bc5;hb=bdc118e9c2371404457f05986a2645a2c8cfd099;hp=73e4452421d5016097ac1a27db725d834530b806;hpb=3c7d9c5b21e0418924ed493911e0679ae89f2acb;p=dak.git

diff --git a/katie.conf b/katie.conf
index 73e44524..ccd32f59 100644
--- a/katie.conf
+++ b/katie.conf
@@ -26,7 +26,8 @@ Dinstall
    PackagesServer "packages.debian.org";
    NewAckList "/org/ftp.debian.org/katie/log";
    LockFile "/org/ftp.debian.org/katie/lock";
-   Bcc "troup@auric.debian.org";
+   Bcc "archive@ftp-master.debian.org";
+   GroupOverrideFilename "override.group-maint";
 
 };
 
@@ -94,14 +95,35 @@ 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
 {
 
@@ -183,7 +205,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";
 };
@@ -191,7 +213,8 @@ Rhona
 Suite
 {
 
-  // Priority determines which suite is used for the Maintainers filed as generated by charisma/da_mkmaintainers (highest wins)
+  // Priority determines which suite is used for the Maintainers file
+  // as generated by charisma (highest wins).
   
   Experimental
   {
@@ -223,6 +246,7 @@ Suite
 	Origin "Debian";
 	Description "Experimental packages - not released; use at your own risk.";
 	CodeName "experimental";
+	NotAutomatic "yes";
 	OverrideCodeName "sid";
 	OverrideSuite "unstable";
 	Priority "0";
@@ -297,7 +321,9 @@ Suite
 	  "all" "";
 	  "alpha" ""; 
 	  "arm" "";
+	  "hppa" "";
 	  "i386" "";
+	  "ia64" "";
 	  "m68k" "";
 	  "powerpc" "";
 	  "sparc" "";
@@ -309,6 +335,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 
@@ -340,7 +394,7 @@ Suite
 	Description "Debian Unstable - Not Released";
 	CodeName "sid";
 	OverrideCodeName "sid";
-	Priority "4";
+	Priority "5";
   };
 
 };
@@ -355,6 +409,7 @@ Dir
   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/";
 };
 
@@ -363,7 +418,6 @@ DB
   Name "projectb";
   Host ""; 
   Port -1;
-  ROUser "nobody";
 };
 
 Architectures