From: Mark Hymers <mhy@debian.org>
Date: Wed, 27 Jul 2011 19:08:14 +0000 (+0100)
Subject: Merge remote branch 'mhy/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=c43e58d8aeea3dfbbad8f289fa02b97c7a9e0169;hp=46c985bfae7abf3baf5c47970e748d350d7b2d35

Merge remote branch 'mhy/master'
---

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index e7509763..1cf71a26 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -58,14 +58,6 @@ Queue-Report
   };
 };
 
-Import-Keyring
-{
-  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
-    {
-      Debian-Maintainer "true";
-    };
-};
-
 Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 6b5e17a9..f978505c 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -98,19 +98,6 @@ Rm
    Bcc "removed-packages@qa.debian.org";
 };
 
-Import-Archive
-{
-  ExportDir "/srv/ftp-master.debian.org/dak/import-archive-files/";
-};
-
-Import-Keyring
-{
-  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
-    {
-      Debian-Maintainer "true";
-    };
-};
-
 Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";