From: Mark Hymers <mhy@debian.org>
Date: Tue, 22 Mar 2011 10:20:18 +0000 (+0000)
Subject: Merge remote branch 'mhy/master' into merge
X-Git-Tag: debian-r/squeeze~275^2~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=93746045d5a3a4943e1e464c77880a7070a31aba;hp=35eea3b7e76b202f70ef627db6547d334e8c91ed;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-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";
+  }
 }