httpd takes care of /var/log/plcapi.log and permissions

[myplc.git] / plc.d / mail

diff --git a/plc.d/mail b/plc.d/mail
index 6698a68..1585622 100755 (executable)
--- a/plc.d/mail
+++ b/plc.d/mail
@@ -1,19 +1,20 @@
 #!/bin/bash
 #
-# priority: 250
+# priority: 200
 #
 # Start local mail server.
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: mail,v 1.1 2006/04/24 15:49:32 mlhuang Exp $
-#
 
 # Source function library and configuration
 . /etc/plc.d/functions
 . /etc/planetlab/plc_config
 
+# Be verbose
+set -x
+
 case "$1" in
     start)
        if [ "$PLC_MAIL_ENABLED" != "1" ] ; then
@@ -23,7 +24,14 @@ case "$1" in
        MESSAGE=$"Starting mail server"
        dialog "$MESSAGE"
 
-       service sendmail start
+       # Add apache to list of users that can send mail as others
+       # without a warning, so that the API can send out mail.
+       count=$(grep ^apache /etc/mail/trusted-users|wc -l)
+       if [ $count -eq 0 ] ; then
+               echo "apache" >>/etc/mail/trusted-users
+       fi
+
+       (exec 3>&- 4>&- ; service sendmail start)
        check
 
        result "$MESSAGE"