Merge remote branch 'mhy/master'

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index e7509763f4c66d22f22f68f4bd3b7d0660767ad2..1cf71a26c7de85382168176c3eb26f91547fd86b 100644 (file)
--- 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 6b5e17a9db52dc157b4f063d76b55333775e3099..f978505c4025848120aec3d2f2dbe8d5e5eadc9e 100644 (file)
--- 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";