Remove unused MorgueReject setting

[dak.git] / config / debian / dak.conf

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 7c175ae4f37d6a5aee351102cd5472f23a75f592..f5424dcca280d65b0b0cc83c86b6a56fff9251bb 100644 (file)
--- 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
@@ -196,17 +196,6 @@ Suite
          contrib;
          non-free;
        };
-       VersionChecks
-       {
-         MustBeNewerThan
-         {
-           OldStable;
-         };
-         Enhances
-          {
-           OldStable;
-         };
-       };
   };
 
   Proposed-Updates
@@ -217,24 +206,6 @@ Suite
          contrib;
          non-free;
        };
-       VersionChecks
-       {
-         MustBeNewerThan
-         {
-           OldStable;
-           Stable;
-         };
-//       MustBeOlderThan
-//       {
-//         Testing;
-//         Unstable;
-//         Experimental;
-//       };
-         Enhances
-          {
-           Stable;
-         };
-       };
   };
 
   Testing
@@ -255,25 +226,6 @@ Suite
          contrib;
          non-free;
        };
-       VersionChecks
-       {
-         MustBeNewerThan
-         {
-           OldStable;
-           Stable;
-//         Proposed-Updates;
-           Testing;
-         };
-         MustBeOlderThan
-         {
-           Unstable;
-           Experimental;
-         };
-         Enhances
-          {
-           Testing;
-          };
-       };
   };
 
   Squeeze-Updates
@@ -284,25 +236,6 @@ Suite
          contrib;
          non-free;
        };
-       VersionChecks
-       {
-         MustBeNewerThan
-         {
-           Stable;
-         };
-      MustBeOlderThan
-      {
-        Testing;
-        Testing-Proposed-Updates;
-        Unstable;
-        Experimental;
-      };
-         Enhances
-      {
-           Stable;
-         };
-       };
-
   };
 
   Unstable
@@ -313,17 +246,6 @@ Suite
          contrib;
          non-free;
        };
-       VersionChecks
-       {
-         MustBeNewerThan
-         {
-           OldStable;
-           Stable;
-//         Proposed-Updates;
-           Testing;
-           Testing-Proposed-Updates;
-         };
-       };
   };
 
   Experimental
@@ -334,30 +256,24 @@ Suite
          contrib;
          non-free;
        };
-       VersionChecks
-       {
-         MustBeNewerThan
-         {
-           OldStable;
-           Stable;
-//         Proposed-Updates;
-           Testing;
-           Testing-Proposed-Updates;
-           Unstable;
-         };
-       };
   };
-
 };
 
 SuiteMappings
 {
+ "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 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";
@@ -365,6 +281,7 @@ SuiteMappings
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map stable-proposed-updates proposed-updates";
+ "map stable-updates proposed-updates";
  "map-unreleased oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
@@ -372,9 +289,6 @@ SuiteMappings
  "map testing-security testing-proposed-updates";
  "map-unreleased testing unstable";
  "map-unreleased testing-proposed-updates unstable";
- "silent-map lenny-security oldstable-security";
- "silent-map squeeze-security stable-security";
- "silent-map wheezy-security testing-security";
 };
 
 AutomaticByHandPackages {
@@ -418,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/";
@@ -451,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
@@ -525,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;
+  };
+}