X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=f5424dcca280d65b0b0cc83c86b6a56fff9251bb;hb=70f6c4de94c2d2e1bb76e165a2f15aaf0184215c;hp=275615171489fed72060858cbf0eaa7567bedbc1;hpb=8ff7594617f38652f8dbac95682dcfc200d6dbf5;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 27561517..f5424dcc 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -69,7 +69,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,katie,release,qa,www-data,guest";
+  KnownPostgres "postgres,dak,katie,release,qa,www-data,guest,repuser";
 };
 
 Clean-Queues
@@ -168,6 +168,16 @@ Check-Overrides
 
 Suite
 {
+  OldStable
+  {
+	Components
+	{
+	  main;
+	  contrib;
+	  non-free;
+	};
+  };
+
   Stable
   {
 	Components
@@ -178,7 +188,7 @@ Suite
 	};
   };
 
-  Proposed-Updates
+  OldStable-Proposed-Updates
   {
 	Components
 	{
@@ -186,23 +196,15 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
+  };
+
+  Proposed-Updates
+  {
+	Components
 	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	    Stable;
-	  };
-//	  MustBeOlderThan
-//	  {
-//	    Testing;
-//	    Unstable;
-//	    Experimental;
-//	  };
-	  Enhances
-          {
-	    Stable;
-	  };
+	  main;
+	  contrib;
+	  non-free;
 	};
   };
 
@@ -224,25 +226,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	    Stable;
-//	    Proposed-Updates;
-	    Testing;
-	  };
-	  MustBeOlderThan
-	  {
-	    Unstable;
-	    Experimental;
-	  };
-	  Enhances
-          {
-	    Testing;
-          };
-	};
   };
 
   Squeeze-Updates
@@ -253,19 +236,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    Stable;
-	    Testing;
-	  };
-	  Enhances
-      {
-	    Testing;
-	  };
-	};
-
   };
 
   Unstable
@@ -276,17 +246,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	    Stable;
-//	    Proposed-Updates;
-	    Testing;
-	    Testing-Proposed-Updates;
-	  };
-	};
   };
 
   Experimental
@@ -297,37 +256,33 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	    Stable;
-//	    Proposed-Updates;
-	    Testing;
-	    Testing-Proposed-Updates;
-	    Unstable;
-	  };
-	};
   };
-
 };
 
 SuiteMappings
 {
-// "propup-version oldstable-security stable testing testing-proposed-updates unstable";
+ "silent-map lenny-security oldstable-security";
+ "silent-map squeeze-security stable-security";
+ "silent-map wheezy-security testing-security";
+ "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 lenny stable";
- "map squeeze testing";
+ "map lenny oldstable";
+ "map lenny-proposed-updates oldstable-proposed-updates";
+ "map squeeze stable";
+ "map squeeze-proposed-updates proposed-updates";
+ "map squeeze-updates proposed-updates";
+ "map wheezy testing";
+ "map wheezy-proposed-updates testing-proposed-updates";
  "map sid unstable";
  "map rc-buggy experimental";
-// "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 stable-updates proposed-updates";
+ "map-unreleased oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";
@@ -362,6 +317,7 @@ AutomaticByHandPackages {
     Source "win32-loader";
     Section "byhand";
     Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-win32-loader";
+  };
 };
 
 Dir
@@ -376,7 +332,6 @@ Dir
   Log "/srv/ftp-master.debian.org/log/";
   Lock "/srv/ftp-master.debian.org/lock";
   Morgue "/srv/ftp-master.debian.org/morgue/";
-  MorgueReject "reject";
   Override "/srv/ftp-master.debian.org/scripts/override/";
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
   TempPath "/srv/ftp-master.debian.org/tmp/";
@@ -393,9 +348,9 @@ Dir
     Unchecked "/srv/ftp-master.debian.org/queue/unchecked/";
     Newstage "/srv/ftp-master.debian.org/queue/newstage/";
     BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
-    Embargoed "/does/not/exist/";
-    Unembargoed "/does/not/exist/";
-    Disembargo "/does/not/exist/";
+    Embargoed "/srv/ftp-master.debian.org/does/not/exist/";
+    Unembargoed "/srv/ftp-master.debian.org/does/not/exist/";
+    Disembargo "/srv/ftp-master.debian.org/does/not/exist/";
   };
 };
 
@@ -409,9 +364,13 @@ Queue-Report
 
 DB
 {
-  Name "projectb";
-  Host "";
-  Port 5433;
+  Service "projectb";
+  // PoolSize should be at least ThreadCount + 1
+  PoolSize 5;
+  // MaxOverflow shouldn't exceed postgresql.conf's max_connections - PoolSize
+  MaxOverflow 13;
+  // should be false for encoding == SQL_ASCII
+  Unicode "false"
 };
 
 Archive
@@ -483,3 +442,43 @@ Changelogs
   Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog";
   Export "/srv/ftp-master.debian.org/export/changelogs";
 }
+
+Generate-Releases
+{
+  MD5Sum
+  {
+    oldstable;
+    oldstable-proposed-updates;
+    proposed-updates;
+    stable;
+    squeeze-updates;
+    testing;
+    testing-proposed-updates;
+    unstable;
+    experimental;
+  };
+  SHA1
+  {
+    oldstable;
+    oldstable-proposed-updates;
+    proposed-updates;
+    squeeze-updates;
+    stable;
+    testing;
+    testing-proposed-updates;
+    unstable;
+    experimental;
+  };
+  SHA256
+  {
+    oldstable;
+    oldstable-proposed-updates;
+    proposed-updates;
+    squeeze-updates;
+    stable;
+    testing;
+    testing-proposed-updates;
+    unstable;
+    experimental;
+  };
+}