slitaz-pizza rev 69
Fix mail notification. Use busybox applet instead of postfix sendmail
author | Eric Joseph-Alexandre <erjo@slitaz.org> |
---|---|
date | Thu Nov 01 13:25:53 2012 +0100 (2012-11-01) |
parents | f4ff182be550 |
children | 9047e2bc7c48 |
files | pizza pizza-bot pizza.conf |
line diff
1.1 --- a/pizza Thu Nov 01 01:34:41 2012 +0100 1.2 +++ b/pizza Thu Nov 01 13:25:53 2012 +0100 1.3 @@ -86,6 +86,7 @@ 1.4 grep ^PIZZA_URL /etc/slitaz/pizza.conf >> $config 1.5 grep ^MAIL_DOMAIN /etc/slitaz/pizza.conf >> $config 1.6 grep ^MAIL_SERVER /etc/slitaz/pizza.conf >> $config 1.7 + grep ^MAIL_FROM /etc/slitaz/pizza.conf >> $config 1.8 } 1.9 1.10 # Log activities, we want first letter capitalized.
2.1 --- a/pizza-bot Thu Nov 01 01:34:41 2012 +0100 2.2 +++ b/pizza-bot Thu Nov 01 13:25:53 2012 +0100 2.3 @@ -20,6 +20,7 @@ 2.4 lockfile="/var/lock/pizza.lock" 2.5 feeds="$pizza/xml" 2.6 2.7 + 2.8 # Log activities, we want first letter capitalized. 2.9 log() { 2.10 grep ^[A-Z] | \ 2.11 @@ -137,10 +138,10 @@ 2.12 chown -R www.www $public/$name 2.13 2.14 # Send mail if enabled. 2.15 - if [ "$MAIL_DOMAIN" ]; then 2.16 + if [ "$MAIL_FROM" ]; then 2.17 . $public/$name/receipt 2.18 echo "Sending mail to: $MAINTAINER" 2.19 - mail_body | /usr/sbin/sendmail $MAINTAINER 2.20 + mail_body | /usr/bin/sendmail -f $MAIL_FROM $MAINTAINER 2.21 fi 2.22 2.23 # Count builds
3.1 --- a/pizza.conf Thu Nov 01 01:34:41 2012 +0100 3.2 +++ b/pizza.conf Thu Nov 01 13:25:53 2012 +0100 3.3 @@ -26,6 +26,7 @@ 3.4 # Pizza Mailer Settings (empty to disable). 3.5 MAIL_DOMAIN="slitaz.me" 3.6 MAIL_SERVER="127.0.0.1" 3.7 +MAIL_FROM="pizza@slitaz.org" 3.8 3.9 # Local packages synced from a mirror 3.10 RSYNC_PKGS="rsync://mirror.slitaz.org/slitaz-$SLITAZ_VERSION/"