X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fdak.conf;h=f42092735e0495796075233446328d694e715c8f;hb=cc8850a3e819a5ac845be15a2771291a21d110a1;hp=88aa2a9e4f914cf30ebed5fe8e8b7df26813f926;hpb=43ebfbd18e102ee7378e54e4982da21ed80c187e;p=dak.git

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 88aa2a9e..f4209273 100644
--- 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";
     };
 
   };
@@ -111,7 +111,7 @@ Import-Users-From-Passwd
   // The Primary GID of your users. Using uma it is the gid from group users.
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,katie,dak,www-data,qa,guest";
+  KnownPostgres "postgres,katie,dak,www-data,qa,guest,repuser";
 };
 
 Queue-Report
@@ -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/";
@@ -218,7 +219,6 @@ Dir
   Log "/srv/backports-master.debian.org/log/";
   Lock "/srv/backports-master.debian.org/lock";
   Morgue "/srv/backports-master.debian.org/morgue/";
-  MorgueReject "reject";
   Override "/srv/backports-master.debian.org/scripts/override/";
   QueueBuild "/srv/backports-master.debian.org/buildd/";
   UrgencyLog "/srv/backports-master.debian.org/testing/urgencies/";
@@ -242,16 +242,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";
 };
@@ -377,24 +381,6 @@ Priority
   source 0; // i.e. unused
 };
 
-OverrideType
-{
-  deb;
-  udeb;
-  dsc;
-};
-
-Location
-{
-  // Pool locations on backports.debian.org
-  /srv/backports-master.debian.org/ftp/pool/
-    {
-      Archive "backports";
-      Type "pool";
-    };
-
-};
-
 Urgency
 {
   Default "low";
@@ -431,3 +417,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;
+  };
+}