From: Mark Hymers <mhy@debian.org>
Date: Tue, 22 Mar 2011 10:41:51 +0000 (+0000)
Subject: Merge remote branch 'mhy/master' into merge
X-Git-Tag: debian-r/squeeze~275^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e6a0eee330810ba5bdb752f67f7dc6cc2b623184;hp=b8d1a705c16f087e93d2ee8232c1ecf379242e86;p=dak.git

Merge remote branch 'mhy/master' into merge

Signed-off-by: Mark Hymers <mhy@debian.org>
---

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index a9eb3fb4..b888a606 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -453,7 +453,7 @@ DB
 {
   Service "projectb";
   // PoolSize should be at least ThreadCount + 1
-  PoolSize 17;
+  PoolSize 5;
   // MaxOverflow shouldn't exceed postgresql.conf's max_connections - PoolSize
   MaxOverflow 13;
   // should be false for encoding == SQL_ASCII
diff --git a/config/debian/dak.conf-etc b/config/debian/dak.conf-etc
index b0f6a50e..5336a8df 100644
--- a/config/debian/dak.conf-etc
+++ b/config/debian/dak.conf-etc
@@ -7,5 +7,12 @@ Config
     DakConfig           "/srv/ftp-master.debian.org/dak/config/debian/dak.conf";
     AptConfig           "/srv/ftp-master.debian.org/dak/config/debian/apt.conf";
   }
+  ries.debian.org
+  {
+    AllowLocalConfig    "false";
+    DatabaseHostname    "ftp-master";
+    DakConfig           "/srv/ftp-master.debian.org/dak/config/debian/dak.conf";
+    AptConfig           "/srv/ftp-master.debian.org/dak/config/debian/apt.conf";
+  }
 }