Merge remote branch 'mhy/master'

diff --combined config/debian-security/dak.conf
index 8ef7060f7104961280681640b348c9ce90f2ec84,e7509763f4c66d22f22f68f4bd3b7d0660767ad2..1cf71a26c7de85382168176c3eb26f91547fd86b
--- 1/config/debian-security/dak.conf
--- 2/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@@ -1,8 -1,5 +1,5 @@@
  Dinstall
  {
-    GPGKeyring {
-      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-    };
     // was non-us.d.o path before
     SigningKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
     SigningPubKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
@@@ -61,6 -58,14 +58,6 @@@ Queue-Repor
    };
  };
  
 -Import-Keyring
 -{
 -  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
 -    {
 -      Debian-Maintainer "true";
 -    };
 -};
 -
  Import-LDAP-Fingerprints
  {
    LDAPDn "ou=users,dc=debian,dc=org";
@@@ -111,11 -116,6 +108,6 @@@ R
    LogFile "/srv/security-master.debian.org/dak-log/removals.txt";
  };
  
- Init-Archive
- {
-   ExportDir "/srv/security-master.debian.org/dak/import-archive-files/";
- };
- 
  Clean-Suites
  {
    // How long (in seconds) dead packages are left before being killed

diff --combined config/debian/dak.conf
index 2f2ddc8e810c82d43437cad2f37089ebd2c5356d,6b5e17a9db52dc157b4f063d76b55333775e3099..f978505c4025848120aec3d2f2dbe8d5e5eadc9e
--- 1/config/debian/dak.conf
--- 2/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@@ -1,9 -1,5 +1,5 @@@
  Dinstall
  {
-    GPGKeyring {
-       "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-       "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
-    };
     SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
     SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
  //   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
@@@ -102,6 -98,19 +98,6 @@@ R
     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";