X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=9763d1be9e9d223fcaa967f21080eeb19bb9a1d8;hb=fb3d44c5e9b4a010f56cffd8fd5e35d6221805f9;hp=4b6c35a4b5fa9ccd373a5cceb1f6610f0d501a58;hpb=c7061f3025ae8c7413054cc7eb08839ea29b061a;p=dak.git

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 4b6c35a4..9763d1be 100644
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -4,7 +4,7 @@ Dinstall
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "722F1AED";
+   SigningKeyIds "1DB114E0";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -16,21 +16,30 @@ Dinstall
    LockFile "/org/non-us.debian.org/katie/lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
-   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
-   FutureTimeTravelGrace 28800; // 6 hours
+   FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 300;
    CloseBugs "true";
    SuiteSuffix "non-US";
    OverrideDisparityCheck "true";
    StableDislocationSupport "false";
+   Reject
+   {
+     NoSourceOnly "true";
+   };
+};
+
+Lauren
+{
+   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
+   MoreInfoURL "http://people.debian.org/~joey/3.0r4/";
 };
 
 Julia
 {
   ValidGID "800";
-  // Comma seperated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,www-data,katie,auric";
+  // Comma separated list of users who are in Postgres but not the passwd file
+  KnownPostgres "udmsearch,postgres,www-data,katie,auric";
 };
 
 Shania
@@ -83,81 +92,10 @@ Rhona
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
   MorgueSubDir "rhona";
-  OverrideFilename "override.source-only";
 };
 
 Suite
 {
-  OldStable
-  {
-	Components 
-	{
-	  non-US/main;
-	  non-US/contrib;
-	  non-US/non-free;
-	};
-	Architectures 
-	{
-	  source;  
-	  all;
-	  alpha; 
-	  arm;
-	  i386;
-	  m68k;
-	  powerpc;
-	  sparc;
-	};
-	Announce "debian-changes@lists.debian.org";
-	Version "2.2r7";
-	Origin "Debian";
-	Description "Debian 2.2r7 Released 12th July 2002";
-	CodeName "potato";
-	OverrideCodeName "potato";
-	Priority "1";
-	Untouchable "1";
-	ChangeLogBase "dists/oldstable/non-US/";
-  };
-
-  Old-Proposed-Updates
-  {
-	Architectures 
-	{
-	  source;  
-	  all;
-	  alpha; 
-	  arm;
-	  i386;
-	  m68k;
-	  powerpc;
-	  sparc;
-	};
-	Announce "debian-changes@lists.debian.org";
-	CopyChanges "dists/old-proposed-updates/";
-	CopyKatie "/org/non-us.debian.org/queue/old-proposed-updates/";
-	Version "2.2r7";
-	Origin "Debian";
-	Description "Proposed Updates for Debian 2.2r7 - Not Released";
-	CodeName "old-proposed-updates";
-	OverrideCodeName "potato";
-	OverrideSuite "oldstable";
-	Priority "2";
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	  };
-	  MustBeOlderThan
-	  {
-	    Stable;
-	    Proposed-Updates;
-	    Testing;
-	    Testing-Proposed-Updates;
-	    Unstable;
-	    Experimental;
-	  };
-	};
-  };
 
   Stable
   {
@@ -184,9 +122,9 @@ Suite
 	  sparc;
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "3.0";
+	Version "3.0r4";
 	Origin "Debian";
-	Description "Debian 3.0 Released 20th July 2002";
+	Description "Debian 3.0r4 Released 31st December 2004";
 	CodeName "woody";
 	OverrideCodeName "woody";
 	Priority "3";
@@ -232,8 +170,6 @@ Suite
 	{
 	  MustBeNewerThan
 	  {
-	    OldStable;
-	    Old-Proposed-Updates;
 	    Stable;
 	  };
 	  MustBeOlderThan
@@ -309,8 +245,6 @@ Suite
 	{
 	  MustBeNewerThan
 	  {
-	    OldStable;
-	    Old-Proposed-Updates;
 	    Stable;
 	    Proposed-Updates;
 	    Testing;
@@ -359,8 +293,6 @@ Suite
 	{
 	  MustBeNewerThan
 	  {
-	    OldStable;
-	    Old-Proposed-Updates;
 	    Stable;
 	    Proposed-Updates;
 	    Testing;
@@ -373,11 +305,6 @@ Suite
 
 SuiteMappings
 {
- "map oldstable old-proposed-updates";
- "map oldstable-security old-proposed-updates";
- "map-unreleased oldstable stable";
- "map-unreleased old-proposed-updates stable";
-
  // JT - temp measure
  "map testing-security proposed-updates";
 
@@ -405,7 +332,6 @@ Dir
   UrgencyLog "/org/non-us.debian.org/testing/";
   Queue
   {
-    Root "/org/non-us.debian.org/queue/";
     Accepted "/org/non-us.debian.org/queue/accepted/";
     Byhand "/org/non-us.debian.org/queue/byhand/";
     Done "/org/non-us.debian.org/queue/done/";
@@ -509,11 +435,30 @@ OverrideType
 
 Location
 {
-  
-  // Pool locations on non-US.debian.org
+  /org/non-us.debian.org/ftp/dists/
+    {
+      Archive "non-US";
+      Type "legacy";
+    };
+
+  /org/non-us.debian.org/ftp/dists/old-proposed-updates/
+    {
+      Archive "non-US";
+      Type "legacy-mixed";
+    };
+
   /org/non-us.debian.org/ftp/pool/
     {
       Archive "non-US";
+      Suites 
+	{
+	  OldStable;
+	  Stable;
+	  Proposed-Updates;
+	  Testing;
+	  Testing-Proposed-Updates;
+	  Unstable;
+        };
       Type "pool";
     };