From: Joerg Jaspert Date: Mon, 26 Oct 2009 18:18:46 +0000 (+0100) Subject: Merge commit 'mhy/master' into merge X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=0b7a883287f980e1d44e6d4fbf6050d85d1e4963;hp=f41a5c6d7f9942de65c9644abb5517034f55d425;p=dak.git Merge commit 'mhy/master' into merge * commit 'mhy/master': try fixing up this *again* Signed-off-by: Joerg Jaspert --- diff --git a/config/debian/dak.conf b/config/debian/dak.conf index acb2ac00..474a4f3d 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -8,7 +8,8 @@ Dinstall 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 "; MyAdminAddress "ftpmaster@debian.org"; MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject()