X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=fc251f8bb50303472a87f8c62c298b7a3fd13d71;hb=f8996e240d9d0278bce098e23be63db0bcc6fbee;hp=2eb45d24031ffc770bccf3ba2fb34ba0efbdef50;hpb=3e250c109de21b22f15ac49c0a5063bda55863a0;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 2eb45d24..fc251f8b 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.0r4/";
+   StableRejector "the Stable Release Team";
+   StableMail "debian-release@lists.debian.org";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r5/";
 };
 
 Import-LDAP-Fingerprints
@@ -300,6 +307,7 @@ Suite
 	CodeName "sarge-proposed-updates";
 	OverrideCodeName "sarge";
 	OverrideSuite "oldstable";
+	Untouchable "1";
 	Priority "2";
 	VersionChecks
 	{
@@ -399,6 +407,7 @@ Suite
 	CodeName "etch-proposed-updates";
 	OverrideCodeName "etch";
 	OverrideSuite "stable";
+	ValidTime 604800; // 7 days
 	Priority "4";
 	VersionChecks
 	{
@@ -453,6 +462,7 @@ Suite
 	Description "Debian Testing distribution - Not Released";
 	CodeName "lenny";
 	OverrideCodeName "lenny";
+	ValidTime 604800; // 7 days
 	Priority "5";
 	UdebComponents
 	{
@@ -492,6 +502,7 @@ Suite
 	CodeName "testing-proposed-updates";
 	OverrideCodeName "lenny";
 	OverrideSuite "testing";
+	ValidTime 604800; // 7 days
 	Priority "6";
 	VersionChecks
 	{
@@ -578,6 +589,7 @@ Suite
 	Description "Debian Unstable - Not Released";
 	CodeName "sid";
 	OverrideCodeName "sid";
+	ValidTime 604800; // 7 days
 	Priority "7";
 	VersionChecks
 	{
@@ -630,6 +642,7 @@ Suite
 	NotAutomatic "yes";
 	OverrideCodeName "sid";
 	OverrideSuite "unstable";
+	ValidTime 604800; // 7 days
 	Priority "0";
 	VersionChecks
 	{
@@ -653,11 +666,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";