X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=acb2ac0088fffccd3ed418feee7bc5c382d53c87;hb=201f4fe6b98a5c7bae22b66110c952ea2e593ef5;hp=6ad96a6b8cd97a793bf0470b86485d66b9687c18;hpb=b55609076af7ecffd70a39ad98282321c57c1b9a;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 6ad96a6b..acb2ac00 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";
@@ -25,7 +25,6 @@ Dinstall
    CloseBugs "true";
    OverrideDisparityCheck "true";
    DefaultSuite "unstable";
-   UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py";
    QueueBuildSuites
    {
      unstable;
@@ -94,7 +93,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,katie,release";
+  KnownPostgres "postgres,dak,katie,release,qa,www-data,guest";
 };
 
 Clean-Queues
@@ -137,7 +136,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 +524,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";