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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 6a989215..fc251f8b 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -34,9 +34,40 @@ Dinstall
    Reject
    {
      NoSourceOnly "true";
+     ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
    };
 };
 
+Transitions
+{
+   TempPath "/srv/ftp.debian.org/tmp/";
+};
+
+Binary-Upload-Restrictions
+{
+ Components
+ {
+   //main;
+   //contrib;
+   // Yay for consensus through GRs voted on by people not actually involved in the affected architectures
+   none;
+ };
+ unstable
+ {
+   arm
+   {
+     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
+     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
+     F849E2025D1C194DE62BC6C829BE5D2268FD549F;
+   };
+   alpha 
+   {
+     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
+     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
+   };   
+  };
+};
+
 Binary-Upload-Restrictions
 {
  Components
@@ -95,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";
@@ -142,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
@@ -221,9 +259,9 @@ Suite
 	  sparc;
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "3.1r6";
+	Version "3.1r8";
 	Origin "Debian";
-	Description "Debian 3.1r6 Released 7 April 2007";
+	Description "Debian 3.1r8 Released 12 April 2008";
 	CodeName "sarge";
 	OverrideCodeName "sarge";
 	Priority "2";
@@ -269,6 +307,7 @@ Suite
 	CodeName "sarge-proposed-updates";
 	OverrideCodeName "sarge";
 	OverrideSuite "oldstable";
+	Untouchable "1";
 	Priority "2";
 	VersionChecks
 	{
@@ -368,6 +407,7 @@ Suite
 	CodeName "etch-proposed-updates";
 	OverrideCodeName "etch";
 	OverrideSuite "stable";
+	ValidTime 604800; // 7 days
 	Priority "4";
 	VersionChecks
 	{
@@ -407,6 +447,7 @@ Suite
 	  alpha;
 	  amd64;
 	  arm;
+	  armel;
 	  hppa;
 	  i386;
 	  ia64;
@@ -421,6 +462,7 @@ Suite
 	Description "Debian Testing distribution - Not Released";
 	CodeName "lenny";
 	OverrideCodeName "lenny";
+	ValidTime 604800; // 7 days
 	Priority "5";
 	UdebComponents
 	{
@@ -444,10 +486,10 @@ Suite
 	  alpha;
 	  amd64;
 	  arm;
+	  armel;
 	  hppa;
 	  i386;
 	  ia64;
-	  m68k;
 	  mips;
 	  mipsel;
 	  powerpc;
@@ -460,6 +502,7 @@ Suite
 	CodeName "testing-proposed-updates";
 	OverrideCodeName "lenny";
 	OverrideSuite "testing";
+	ValidTime 604800; // 7 days
 	Priority "6";
 	VersionChecks
 	{
@@ -546,6 +589,7 @@ Suite
 	Description "Debian Unstable - Not Released";
 	CodeName "sid";
 	OverrideCodeName "sid";
+	ValidTime 604800; // 7 days
 	Priority "7";
 	VersionChecks
 	{
@@ -598,6 +642,7 @@ Suite
 	NotAutomatic "yes";
 	OverrideCodeName "sid";
 	OverrideSuite "unstable";
+	ValidTime 604800; // 7 days
 	Priority "0";
 	VersionChecks
 	{
@@ -621,13 +666,14 @@ 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";
  "map-unreleased oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
@@ -639,7 +685,7 @@ SuiteMappings
 
 AutomaticByHandPackages {
   "debian-installer-images" {
-    Source "xxx-debian-installer";
+    Source "debian-installer";
     Section "raw-installer";
     Extension "tar.gz";
     Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-di";
@@ -658,6 +704,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
@@ -673,7 +726,7 @@ Dir
   MorgueReject "reject";
   Override "/srv/ftp.debian.org/scripts/override/";
   QueueBuild "/srv/incoming.debian.org/buildd/";
-  UrgencyLog "/srv/ftp.debian.org/testing/urgencies/";
+  UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
   Queue
   {
     Accepted "/srv/ftp.debian.org/queue/accepted/";