X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=8b1b43220b4b9600a15f352462defbb94f4fc328;hb=1e3c89e293b45c4258973f26e3bc0878a3356b4a;hp=89ca01e48322a11422a0cd3826db53433199ea8c;hpb=717f343ebc3c5994b39aa03ccc7035f14faaa9e7;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 89ca01e4..8b1b4322 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,9 +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,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";
@@ -370,16 +353,6 @@ DB
   Unicode "false"
 };
 
-Archive
-{
-  ftp-master
-  {
-    OriginServer "ftp-master.debian.org";
-    PrimaryMirror "ftp.debian.org";
-    Description "Master Archive for the Debian project";
-  };
-};
-
 Urgency
 {
   Default "low";