Merge remote branch 'mhy/master'

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 6b5e17a9db52dc157b4f063d76b55333775e3099..8b1b43220b4b9600a15f352462defbb94f4fc328 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";
@@ -366,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";