Merge commit 'ftpmaster/master' into psycopg2

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b82154b3318b3f6547bae3551b491ca598c99622..345565b3e2b18f631bb0548a02ecab45658efad8 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -126,6 +126,14 @@ Import-Archive
   ExportDir "/srv/ftp.debian.org/dak/import-archive-files/";
 };
 
+Import-Keyring
+{
+  /srv/ftp.debian.org/keyrings/debian-maintainers.gpg
+    {
+      Debian-Maintainer "true";
+    };
+};
+
 Reject-Proposed-Updates
 {
    StableRejector "the Stable Release Team";
@@ -589,6 +597,14 @@ Dir
   };
 };
 
+Queue-Report
+{
+  ReportLocations
+  {
+    822Location "/srv/ftp.debian.org/web/new.822";
+  };
+};
+
 DB
 {
   Name "projectb";