Index: CVSROOT/postcommit_actions
===================================================================
RCS file: /usr/local/cvsroot/CVSROOT/Attic/postcommit_actions,v
diff -u -r1.2 -r1.5
--- CVSROOT/postcommit_actions	9 Feb 2004 13:42:43 -0000	1.2
+++ CVSROOT/postcommit_actions	9 Feb 2004 18:22:54 -0000	1.5
@@ -1,12 +1,12 @@
-#!/var/tmp/py/bin/python2.3
+#!/usr/local/bin/python2.3
 
 # Adapted by bdolicki for openacs.org
 # Changes to http://dev.zope.org/CVS/postcommit_actions :
-#   001
-#   The original file forced python2.1 because os.popen2 didn't work for them.
-#   on Python 1.5.  It does work for us though so we didn't install python2.1 
-#   002
-#   Set some variables
+#   001  The original file forced python2.1.  We are using python2.3 and it works
+#   fine.
+#   002  Set some variables
+#   003  We want to put something like username@openacs.org as the sender email.
+#        (too bad we don't have LDAP, actually)
 
 """Apply checkin actions dictated by traffic_table.py, as checkins occur.
 
@@ -69,8 +69,11 @@
 LDAP_HOST = "your.ldap.host"
 # 002 TODO is it OK to use this address?
 #OFFICIAL_SENDER = "cvs-admin@your.domain"
-OFFICIAL_SENDER = "openacs-cvs-list-admin@willfork.com"
+OFFICIAL_SENDER = "webmaster@openacs.org"
 
+# 003
+MY_DOMAIN = "openacs.org"
+
 # Ceiling on number of lines per file report (diff or "added"), at which point
 # we go to excerpts from the beginning and end:
 FILE_LINES_LIMIT = 1500
@@ -96,7 +99,7 @@
 # Notices about any caught malfunctions will be sent to this address.
 # 002 TODO is it OK to use this address?
 #CVSMASTER = "cvs-admin@zope.com"
-CVSMASTER = "openacs-cvs-list-admin@willfork.com"
+CVSMASTER = "oct@openacs.org"
 
 # You have to plug in the recipients email address via '%' string formatting.
 MAIL_CMD = "/usr/lib/sendmail -t -f %s"
@@ -515,7 +518,10 @@
     if not user:
         return ('', '')
     # Fallback values:
-    email = OFFICIAL_SENDER
+    # 003
+    #email = OFFICIAL_SENDER
+    email = "%s@%s" % (user, MY_DOMAIN)
+
     try:
         fullname = pwd.getpwnam(user)[4]
     except KeyError: