X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=b8e1a4811f49a3e0a507f48feb844c8c516493ab;hb=48799335bb1faa0a452a5d95271e0813d9595250;hp=4181fb01dae391cd09dd7d5f73b0725f2fcf1f79;hpb=2764c503d2f9c2177873f861c9dad76bcd2c04ca;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 4181fb01..b8e1a481 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -126,6 +126,12 @@ Show-New
   HTMLPath "/srv/ftp.debian.org/web/new/";
 }
 
+Show-Deferred
+{
+  LinkPath "/srv/ftp.debian.org/web/deferred/";
+  DeferredQueue "/srv/queued/DEFERRED/";
+}
+
 Import-Users-From-Passwd
 {
   ValidGID "800";
@@ -173,8 +179,9 @@ Import-Archive
 
 Reject-Proposed-Updates
 {
-   StableRejector "Andreas Barth and Martin Zobel-Helas";
-   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r3/";
+   StableRejector "the Stable Release Team";
+   StableMail "debian-release@lists.debian.org";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r5/";
 };
 
 Import-LDAP-Fingerprints
@@ -399,6 +406,7 @@ Suite
 	CodeName "etch-proposed-updates";
 	OverrideCodeName "etch";
 	OverrideSuite "stable";
+	ValidTime 604800; // 7 days
 	Priority "4";
 	VersionChecks
 	{
@@ -453,6 +461,7 @@ Suite
 	Description "Debian Testing distribution - Not Released";
 	CodeName "lenny";
 	OverrideCodeName "lenny";
+	ValidTime 604800; // 7 days
 	Priority "5";
 	UdebComponents
 	{
@@ -480,7 +489,6 @@ Suite
 	  hppa;
 	  i386;
 	  ia64;
-	  m68k;
 	  mips;
 	  mipsel;
 	  powerpc;
@@ -493,6 +501,7 @@ Suite
 	CodeName "testing-proposed-updates";
 	OverrideCodeName "lenny";
 	OverrideSuite "testing";
+	ValidTime 604800; // 7 days
 	Priority "6";
 	VersionChecks
 	{
@@ -579,6 +588,7 @@ Suite
 	Description "Debian Unstable - Not Released";
 	CodeName "sid";
 	OverrideCodeName "sid";
+	ValidTime 604800; // 7 days
 	Priority "7";
 	VersionChecks
 	{
@@ -631,6 +641,7 @@ Suite
 	NotAutomatic "yes";
 	OverrideCodeName "sid";
 	OverrideSuite "unstable";
+	ValidTime 604800; // 7 days
 	Priority "0";
 	VersionChecks
 	{
@@ -692,6 +703,13 @@ AutomaticByHandPackages {
     Extension "tar.gz";
     Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-tag";
   };
+
+  "task-overrides" {
+    Source "tasksel";
+    Section "byhand";
+    Extension "tar.gz";
+    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-task";
+  };
 };
 
 Dir