Remove use of Component in dak.conf, use db instead

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

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 83ed508ad09345047cd8a8185c13e69119bad773..a9f4886c9627275b4844bbb76ceb16d5ebd5d415 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -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
@@ -219,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/";
@@ -243,9 +242,13 @@ 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
@@ -290,28 +293,6 @@ Archive
   };
 };
 
-Component
-{
-  main
-  {
-       Description "Main";
-       MeetsDFSG "true";
-  };
-
-  contrib
-  {
-       Description "Contrib";
-       MeetsDFSG "true";
-  };
-
-  non-free
-  {
-     Description "Software that fails to meet the DFSG";
-     MeetsDFSG "false";
-  };
-
-};
-
 Section
 {
   admin;
@@ -378,24 +359,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";
@@ -435,7 +398,7 @@ Changelogs
 
 Generate-Releases
 {
-  MD5
+  MD5Sum
   {
     lenny-backports;
     lenny-backports-sloppy;