Remove overridecodename from dak.conf

[dak.git] / config / debian / dak.conf

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 2eaccd7641b512c870650902e4e72942baef0e08..b56b90b9bb7e6ae80c9026ab2051b3eb36a9e943 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -64,20 +64,6 @@ Override
    MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
 };
 
-Mirror-Split
-{
-  FTPPath "/srv/ftp-master.debian.org/ftp";
-  TreeRootPath "/srv/ftp-master.debian.org/scratch/dsilvers/treeroots";
-  TreeDatabasePath "/srv/ftp-master.debian.org/scratch/dsilvers/treedbs";
-  BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k };
-  CombinationTrees
-  {
-    popular { i386; powerpc; all; source; };
-    source { source; };
-    everything { source; all; alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k; };
-  };
-};
-
 Show-New
 {
   HTMLPath "/srv/ftp.debian.org/web/new/";
@@ -86,7 +72,7 @@ Show-New
 Show-Deferred
 {
   LinkPath "/srv/ftp.debian.org/web/deferred/";
-  DeferredQueue "/srv/queued/DEFERRED/";
+  DeferredQueue "/srv/upload.debian.org/DEFERRED/";
 }
 
 Import-Users-From-Passwd
@@ -125,7 +111,8 @@ Rm
    };
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-   LogFile "/srv/ftp-master.debian.org/web/removals.txt";
+   LogFile "/srv/ftp.debian.org/web/removals.txt";
+   LogFile822 "/srv/ftp.debian.org/web/removals.822";
    Bcc "removed-packages@qa.debian.org";
 };
 
@@ -208,19 +195,8 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-changes@lists.debian.org";
-       // Version "5.0r0";
-       Origin "Debian";
-       // Description "Debian 5.0r0 Released 14 February 2009";
-       CodeName "lenny";
-       OverrideCodeName "lenny";
        Priority "5";
        ChangeLogBase "dists/stable/";
-       UdebComponents
-       {
-         main;
-         non-free;
-       };
   };
 
   Proposed-Updates
@@ -231,15 +207,9 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
        CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/";
        CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/";
-       Version "5.0-updates";
-       Origin "Debian";
-       Description "Debian 5.0 Proposed Updates - Not Released";
-       CodeName "lenny-proposed-updates";
-       OverrideCodeName "lenny";
        OverrideSuite "stable";
        ValidTime 604800; // 7 days
        Priority "4";
@@ -261,11 +231,6 @@ Suite
            Stable;
          };
        };
-       UdebComponents
-       {
-         main;
-         non-free;
-       };
   };
 
   Testing
@@ -276,18 +241,8 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-testing-changes@lists.debian.org";
-       Origin "Debian";
-       Description "Debian Testing distribution - Not Released";
-       CodeName "squeeze";
-       OverrideCodeName "squeeze";
        ValidTime 604800; // 7 days
        Priority "5";
-       UdebComponents
-       {
-         main;
-         non-free;
-       };
   };
 
   Testing-Proposed-Updates
@@ -298,11 +253,6 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-testing-changes@lists.debian.org";
-       Origin "Debian";
-       Description "Debian Testing distribution updates - Not Released";
-       CodeName "squeeze-proposed-updates";
-       OverrideCodeName "squeeze";
        OverrideSuite "testing";
        ValidTime 604800; // 7 days
        Priority "6";
@@ -325,11 +275,33 @@ Suite
            Testing;
           };
        };
-       UdebComponents
+  };
+
+  Squeeze-Volatile
+  {
+       Components
        {
          main;
+         contrib;
          non-free;
        };
+       OverrideSuite "testing";
+       ValidTime 604800; // 7 days
+       NotAutomatic "yes";
+       Priority "0";
+       VersionChecks
+       {
+         MustBeNewerThan
+         {
+           Stable;
+           Testing;
+         };
+         Enhances
+      {
+           Testing;
+         };
+       };
+
   };
 
   Unstable
@@ -340,11 +312,6 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-devel-changes@lists.debian.org";
-       Origin "Debian";
-       Description "Debian Unstable - Not Released";
-       CodeName "sid";
-       OverrideCodeName "sid";
        ValidTime 604800; // 7 days
        Priority "7";
        VersionChecks
@@ -358,11 +325,6 @@ Suite
            Testing-Proposed-Updates;
          };
        };
-       UdebComponents
-       {
-         main;
-         non-free;
-       };
   };
 
   Experimental
@@ -373,12 +335,7 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-devel-changes@lists.debian.org";
-       Origin "Debian";
-       Description "Experimental packages - not released; use at your own risk.";
-       CodeName "experimental";
        NotAutomatic "yes";
-       OverrideCodeName "sid";
        OverrideSuite "unstable";
        ValidTime 604800; // 7 days
        Priority "0";
@@ -394,11 +351,6 @@ Suite
            Unstable;
          };
        };
-       UdebComponents
-       {
-         main;
-         non-free;
-       };
   };
 
 };
@@ -456,6 +408,7 @@ Dir
   Templates "/srv/ftp-master.debian.org/dak/templates/";
   PoolRoot "pool/";
   Lists "/srv/ftp-master.debian.org/database/dists/";
+  Cache "/srv/ftp-master.debian.org/database/";
   Log "/srv/ftp-master.debian.org/log/";
   Lock "/srv/ftp-master.debian.org/lock";
   Morgue "/srv/ftp-master.debian.org/morgue/";
@@ -469,6 +422,7 @@ Dir
     Byhand "/srv/ftp-master.debian.org/queue/byhand/";
     ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
     OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/";
+    ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
     Done "/srv/ftp-master.debian.org/queue/done/";
     Holding "/srv/ftp-master.debian.org/queue/holding/";
     New "/srv/ftp-master.debian.org/queue/new/";
@@ -494,7 +448,7 @@ DB
 {
   Name "projectb";
   Host "";
-  Port -1;
+  Port 5433;
 };
 
 Architectures
@@ -509,7 +463,6 @@ Architectures
   armel "ARM eabi";
   i386 "Intel ia32";
   ia64 "Intel ia64";
-  m68k "Motorola Mc680x0";
   mips "MIPS (Big Endian)";
   mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";
@@ -659,3 +612,10 @@ Common
   // The default number of threads for multithreading parts of dak:
   ThreadCount 16;
 }
+
+Changelogs
+{
+  Testing "/srv/release.debian.org/tools/trille/current-testing";
+  Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog";
+  Export "/srv/ftp-master.debian.org/export/changelogs";
+}