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 b0f6a50e63e4193a85e94dc102ef1f2b64bbbe4b..5336a8df0aaca8774b1a30ff754512c444507cd8 100644 (file)
--- 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";
+  }
 }