Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

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

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 88aa2a9e4f914cf30ebed5fe8e8b7df26813f926..d97c52bacfe385fb1862ed9866efe5b01da9055a 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -90,16 +90,16 @@ Check-Overrides
 //      OriginSuite "Unstable";
     };
 
-    squeeze-backports
+    lenny-backports-sloppy
     {
       Process "1";
 //      OriginSuite "Unstable";
     };
 
-    lenny-backports-sloppy
+    squeeze-backports
     {
       Process "1";
-      OriginSuite "lenny-backports";
+//      OriginSuite "Unstable";
     };
 
   };
@@ -211,6 +211,7 @@ Dir
 {
   Root "/srv/backports-master.debian.org/ftp/";
   Pool "/srv/backports-master.debian.org/ftp/pool/";
+  Export "/srv/backports-master.debian.org/export/";
   Templates "/srv/backports-master.debian.org/dak/templates/";
   PoolRoot "pool/";
   Lists "/srv/backports-master.debian.org/database/dists/";
@@ -242,16 +243,20 @@ Dir
 
 DB
 {
-  Name "backports";
-  Host "";
-  Port -1;
+  Service "backports";
+  // 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"
 };
 
 SuiteMappings
 {
  "map lenny lenny-backports";
  "map lenny-bpo lenny-backports";
- "map lenny-bpo-sloppy lenny-backports";
+ "map lenny-bpo-sloppy lenny-backports-sloppy";
  "map squeeze squeeze-backports";
  "map squeeze-bpo squeeze-backports";
 };
@@ -431,3 +436,25 @@ Changelogs
 {
   Export "/srv/backports-master.debian.org/export/changelogs";
 }
+
+Generate-Releases
+{
+  MD5Sum
+  {
+    lenny-backports;
+    lenny-backports-sloppy;
+    squeeze-backports;
+  };
+  SHA1
+  {
+    lenny-backports;
+    lenny-backports-sloppy;
+    squeeze-backports;
+  };
+  SHA256
+  {
+    lenny-backports;
+    lenny-backports-sloppy;
+    squeeze-backports;
+  };
+}