Merge remote branch 'mhy/master'

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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 6c4c5c6b852bb4b1d05d949ecc3d04c6b4cf6bbb..1cf71a26c7de85382168176c3eb26f91547fd86b 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -1,8 +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,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";
@@ -119,11 +108,6 @@ Rm
   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