X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-non-US%2Fdak.conf;h=7c407420c75b219393d3b9e0462b386ce77cbf61;hb=17cec6a95a357324d0292155242310aed6757ebf;hp=9763d1be9e9d223fcaa967f21080eeb19bb9a1d8;hpb=9ee4250499b736e19773e56e2e1690c0e03c10e6;p=dak.git

diff --git a/config/debian-non-US/dak.conf b/config/debian-non-US/dak.conf
index 9763d1be..7c407420 100644
--- a/config/debian-non-US/dak.conf
+++ b/config/debian-non-US/dak.conf
@@ -13,7 +13,7 @@ Dinstall
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
-   LockFile "/org/non-us.debian.org/katie/lock";
+   LockFile "/org/non-us.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
@@ -29,30 +29,30 @@ Dinstall
    };
 };
 
-Lauren
+Reject-Proposed-Updates
 {
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
    MoreInfoURL "http://people.debian.org/~joey/3.0r4/";
 };
 
-Julia
+Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "udmsearch,postgres,www-data,katie,auric";
+  KnownPostgres "udmsearch,postgres,www-data,dak,auric";
 };
 
-Shania
+Clean-Queues
 {
   Options
   {
     Days 14;
    };
- MorgueSubDir "shania";
+ MorgueSubDir "queue";
 };
 
 
-Catherine 
+Poolize
 {
   Options 
   {
@@ -60,7 +60,7 @@ Catherine
   };
 };
 
-Natalie
+Control-Overrides
 {
   Options
   {
@@ -71,7 +71,7 @@ Natalie
  ComponentPosition "suffix"; // Whether the component is prepended or appended to the section name
 };
 
-Melanie
+Rm
 {
   Options
   {
@@ -82,16 +82,16 @@ Melanie
    Bcc "removed-packages@qa.debian.org";
 };
 
-Neve
+Import-Archive
 {
-  ExportDir "/org/non-us.debian.org/katie/neve-files/";
+  ExportDir "/org/non-us.debian.org/dak/import-archive-files/";
 };
 
-Rhona
+Clean-Suites
 {
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
-  MorgueSubDir "rhona";
+  MorgueSubDir "pool";
 };
 
 Suite
@@ -158,7 +158,7 @@ Suite
 	};
 	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/proposed-updates/";
-	CopyKatie "/org/non-us.debian.org/queue/proposed-updates/";
+	CopyDotDak "/org/non-us.debian.org/queue/proposed-updates/";
 	Version "3.0-updates";
 	Origin "Debian";
 	Description "Debian 3.0 Proposed Updates - Not Released";
@@ -323,7 +323,7 @@ Dir
   Root "/org/non-us.debian.org/ftp/";
   Pool "/org/non-us.debian.org/ftp/pool/";
   PoolRoot "pool/";
-  Templates "/org/non-us.debian.org/katie/templates/";
+  Templates "/org/non-us.debian.org/dak/templates/";
   Override "/org/non-us.debian.org/scripts/override/";
   Lists "/org/non-us.debian.org/database/dists/";
   Log "/org/non-us.debian.org/log/";