[dak/master] undoing incorrect changes in dak.conf
Signed-off-by: Mike O'Connor <stew@vireo.org>
---
config/debian/dak.conf | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index e5a8286..97215f5 100644
--- 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()
--
1.5.6.5
Reply to: