X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=3e73e4bac6a0d57848bb4dd908018495b7eec7f2;hb=9af1235da5224336ede312fb5c3e0fe791bc19f0;hp=f69dc635eda8f3d1fc30e369c9b73897bd94e194;hpb=958de140ab53b883253f29e7c5acc23c253f0239;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index f69dc635..3e73e4ba 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,14 +1,16 @@
 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";
+      "/usr/share/keyrings/debian-keyring.gpg";
+      "/usr/share/keyrings/debian-keyring.pgp";
+      "/usr/share/keyrings/debian-keyring.pgp";
+//      "/srv/ftp.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 "6070D3A1";
-   SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
+//   SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
+   SendmailCommand "/bin/echo -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
@@ -24,7 +26,6 @@ Dinstall
    BXANotify "true";
    CloseBugs "true";
    OverrideDisparityCheck "true";
-   StableDislocationSupport "false";
    DefaultSuite "unstable";
    UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py";
    QueueBuildSuites
@@ -127,6 +128,14 @@ Import-Archive
   ExportDir "/srv/ftp.debian.org/dak/import-archive-files/";
 };
 
+Import-Keyring
+{
+  /srv/ftp.debian.org/keyrings/debian-maintainers.gpg
+    {
+      Debian-Maintainer "true";
+    };
+};
+
 Reject-Proposed-Updates
 {
    StableRejector "the Stable Release Team";
@@ -590,6 +599,14 @@ Dir
   };
 };
 
+Queue-Report
+{
+  ReportLocations
+  {
+    822Location "/srv/ftp.debian.org/web/new.822";
+  };
+};
+
 DB
 {
   Name "projectb";
@@ -733,3 +750,8 @@ Urgency
     critical;
   };
 };
+
+Content
+{
+  Header "contents"
+}
\ No newline at end of file