undoing incorrect changes in dak.conf

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index e5a82864f49a4fe6203a5e32f83310192638d603..97215f5929ebcf0f96fdbca3627e1e6a6065b4b5 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,16 +1,14 @@
 Dinstall
 {
    GPGKeyring {
-      "/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";
+      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
+      "/srv/keyring.debian.org/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 "/bin/echo -odq -oi -t";
+   SendmailCommand "/usr/sbin/sendmail -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()