X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=c5a87ca1c885bd800ad3e79f13a314505a0aa709;hb=8ecb9ff76c84bb82f9289b03ce79aaa939ea2d82;hp=cf203f778a53df3b607bc3dbbdb573b4b66fde8f;hpb=e5282862932a43025fccf4abbd96b763104b658b;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index cf203f77..c5a87ca1 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
@@ -227,104 +234,6 @@ Check-Overrides
 
 Suite
 {
-  Oldstable
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  arm;
-	  hppa;
-	  i386;
-	  ia64;
-	  m68k;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
-	Announce "debian-changes@lists.debian.org";
-	Version "3.1r8";
-	Origin "Debian";
-	Description "Debian 3.1r8 Released 12 April 2008";
-	CodeName "sarge";
-	OverrideCodeName "sarge";
-	Priority "2";
-	Untouchable "1";
-        ChangeLogBase "dists/oldstable/";
-	UdebComponents
-	{
-	  main;
-	};
-  };
-
-  Oldstable-Proposed-Updates
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  arm;
-	  hppa;
-	  i386;
-	  ia64;
-	  m68k;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
-	Announce "debian-changes@lists.debian.org";
-	CopyChanges "dists/oldstable-proposed-updates/";
-	CopyDotDak "/srv/ftp.debian.org/queue/oldstable-proposed-updates/";
-	CommentsDir "/srv/ftp.debian.org/queue/o-p-u-new/COMMENTS/";
-	Version "3.1-updates";
-	Origin "Debian";
-	Description "Debian 3.1 Proposed Updates - Not Released";
-	CodeName "sarge-proposed-updates";
-	OverrideCodeName "sarge";
-	OverrideSuite "oldstable";
-	Priority "2";
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    Oldstable;
-	  };
-	  MustBeOlderThan
-	  {
-	    Stable;
-	    Testing;
-	    Unstable;
-	    Experimental;
-	  };
-	  Enhances
-          {
-	    Oldstable;
-	  };
-	};
-	UdebComponents
-	{
-	  main;
-	};
-  };
-
   Stable
   {
 	Components
@@ -357,7 +266,7 @@ Suite
 	OverrideCodeName "etch";
 	Priority "5";
 	Untouchable "1";
-        ChangeLogBase "dists/stable/";
+	ChangeLogBase "dists/stable/";
 	UdebComponents
 	{
 	  main;
@@ -399,6 +308,7 @@ Suite
 	CodeName "etch-proposed-updates";
 	OverrideCodeName "etch";
 	OverrideSuite "stable";
+	ValidTime 604800; // 7 days
 	Priority "4";
 	VersionChecks
 	{
@@ -453,6 +363,7 @@ Suite
 	Description "Debian Testing distribution - Not Released";
 	CodeName "lenny";
 	OverrideCodeName "lenny";
+	ValidTime 604800; // 7 days
 	Priority "5";
 	UdebComponents
 	{
@@ -492,6 +403,7 @@ Suite
 	CodeName "testing-proposed-updates";
 	OverrideCodeName "lenny";
 	OverrideSuite "testing";
+	ValidTime 604800; // 7 days
 	Priority "6";
 	VersionChecks
 	{
@@ -545,7 +457,6 @@ Suite
 	};
   };
 
-
   Unstable
   {
 	Components
@@ -566,7 +477,6 @@ Suite
 	  hurd-i386;
 	  i386;
 	  ia64;
-	  m68k;
 	  mips;
 	  mipsel;
 	  powerpc;
@@ -578,6 +488,7 @@ Suite
 	Description "Debian Unstable - Not Released";
 	CodeName "sid";
 	OverrideCodeName "sid";
+	ValidTime 604800; // 7 days
 	Priority "7";
 	VersionChecks
 	{
@@ -616,7 +527,6 @@ Suite
 	  hurd-i386;
 	  i386;
 	  ia64;
-	  m68k;
 	  mips;
 	  mipsel;
 	  powerpc;
@@ -630,6 +540,7 @@ Suite
 	NotAutomatic "yes";
 	OverrideCodeName "sid";
 	OverrideSuite "unstable";
+	ValidTime 604800; // 7 days
 	Priority "0";
 	VersionChecks
 	{
@@ -653,11 +564,11 @@ Suite
 
 SuiteMappings
 {
- "propup-version oldstable-security stable testing testing-proposed-updates unstable";
+// "propup-version oldstable-security stable testing testing-proposed-updates unstable";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
- "map oldstable oldstable-proposed-updates";
- "map oldstable-security oldstable-proposed-updates";
+// "map oldstable oldstable-proposed-updates";
+// "map oldstable-security oldstable-proposed-updates";
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map stable-proposed-updates proposed-updates";