X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=bcc710fd84712bda53c15f2fc968e097acd5ce1b;hb=518f5dbf97dc962de5a4e577a4a01dd6b100769c;hp=e3b927b8301419fb0ee0173e69d756f9de3a1e41;hpb=7bd88059a18fba8df5bc0fc281ff3a006f28a9e9;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index e3b927b8..bcc710fd 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -3,7 +3,7 @@ Dinstall
    GPGKeyring {
       "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
       "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
-      "/srv/ftp.debian.org/keyrings/debian-maintainers.gpg";
+      "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
    };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
@@ -137,7 +137,7 @@ Import-Archive
 
 Import-Keyring
 {
-  /srv/ftp.debian.org/keyrings/debian-maintainers.gpg
+  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
     {
       Debian-Maintainer "true";
     };
@@ -525,13 +525,6 @@ AutomaticByHandPackages {
     Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-di";
   };
 
-  "debian-maintainers" {
-    Source "debian-maintainers";
-    Section "raw-keyring";
-    Extension "gpg";
-    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-dm";
-  };
-
   "tag-overrides" {
     Source "tag-overrides";
     Section "byhand";
@@ -574,6 +567,9 @@ Dir
     Unchecked "/srv/ftp.debian.org/queue/unchecked/";
     Newstage "/srv/ftp.debian.org/queue/newstage/";
     BTSVersionTrack "/srv/ftp.debian.org/queue/bts_version_track/";
+    Embargoed "/does/not/exist/";
+    Unembargoed "/does/not/exist/";
+    Disembargo "/does/not/exist/";
   };
 };