diff --git a/FAQ b/FAQ index 6962204..afaf9e1 100644 --- a/FAQ +++ b/FAQ @@ -75,6 +75,11 @@ A) To send as user 'myuser', edit the function 'do_sendmail' in su myuser -s /bin/sh -c "/usr/sbin/sendmail -oi \"$MAILTO\"" } +Q) How can I pass extra options to sendmail ? + +A) Add a line in /etc/popularity-contest.conf as follow +MTAOPS="-opt1 -opt2 -opt3" + Q) How can I prevent popularity-contest from sending reports via email? A) This is not recommended. Reports are sent by email only when the HTTP diff --git a/debian/changelog b/debian/changelog index ed1b49c..ec02e12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,14 +7,17 @@ popularity-contest (1.52) UNRELEASED; urgency=low [ Bill Allombert ] * Allow cron.daily to run if last run was more than 7 day ago. - Patch from Vagrant Cascadian. Closes: #610876 - * FAQ: document how to disable sending report by email. Thanks, Ryo Furue. - Closes: #502159 + Patch from Vagrant Cascadian. Closes: #610876 + * FAQ: document how to disable sending report by email. Closes: #502159 + Thanks, Ryo Furue. * prepop.pl popcon-stat.pl popcon-process.sh popcon.pl: - sync with popcon.debian.org version: rename all-popcon-results.txt.gz to all-popcon-results.gz to avoid issues with content negotiation. * popularity-contest: - Check whether open(pkg.list) succeed. + * debian/cron.daily, FAQ: + - Add variable MTAOPS to pass extra options to sendmail. Closes: #403916. + Thanks Michelle Konzack -- Bill Allombert Wed, 30 Mar 2011 18:01:48 +0200 diff --git a/debian/cron.daily b/debian/cron.daily index 621f923..6efb140 100644 --- a/debian/cron.daily +++ b/debian/cron.daily @@ -11,6 +11,7 @@ unset MY_HOSTID unset PARTICIPATE unset SUBMITURLS unset USEHTTP +unset MTAOPS # get configuration information . /usr/share/popularity-contest/default.conf @@ -55,9 +56,9 @@ run_popcon() do_sendmail() { if [ -n "$MAILFROM" ]; then - sendmail -oi -f "$MAILFROM" $MAILTO + sendmail -oi $MTAOPS -f "$MAILFROM" $MAILTO else - sendmail -oi $MAILTO + sendmail -oi $MTAOPS $MAILTO fi }