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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 6ad96a6b..bb7682b2 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -3,12 +3,13 @@ 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";
    SigningKeyIds "55BE302B";
-   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
+//   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
+   SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";
    MyEmailAddress "Archive Administrator <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
@@ -25,7 +26,7 @@ Dinstall
    CloseBugs "true";
    OverrideDisparityCheck "true";
    DefaultSuite "unstable";
-   UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py";
+   LintianTags "/srv/ftp.debian.org/dak/config/debian/lintian.tags";
    QueueBuildSuites
    {
      unstable;
@@ -48,7 +49,6 @@ Dinstall
 Transitions
 {
    Notifications "debian-devel@lists.debian.org";
-   TempPath "/srv/ftp.debian.org/tmp/";
 };
 
 Generate-Index-Diffs
@@ -94,7 +94,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 +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";
@@ -561,9 +554,9 @@ Dir
   Override "/srv/ftp.debian.org/scripts/override/";
   QueueBuild "/srv/incoming.debian.org/buildd/";
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
+  TempPath "/srv/ftp.debian.org/tmp/";
   Queue
   {
-    Accepted "/srv/ftp.debian.org/queue/accepted/";
     Byhand "/srv/ftp.debian.org/queue/byhand/";
     ProposedUpdates "/srv/ftp.debian.org/queue/p-u-new/";
     OldProposedUpdates "/srv/ftp.debian.org/queue/o-p-u-new/";