X-Git-Url: http://git.onelab.eu/?p=mom.git;a=blobdiff_plain;f=pl_mom.py;h=ad7559f8033df25e699a68b3a8a0f2136f097800;hp=b4e09b090f64e821424b004649c79de9d0e49e8c;hb=a7ab53cbaf3037b67fbda98fed3887c905d93e96;hpb=86477888b3b0df8ce58cebb4a7ac0ce76b457da7

diff --git a/pl_mom.py b/pl_mom.py
index b4e09b0..ad7559f 100644
--- a/pl_mom.py
+++ b/pl_mom.py
@@ -5,8 +5,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-#
 
 import os
 import sys
@@ -23,8 +21,8 @@ except:
     print "Warning: Configuration file /etc/planetlab/plc_config.py not found"
     PLC_NAME = "PlanetLab"
     PLC_SLICE_PREFIX = "pl"
-    PLC_MAIL_SUPPORT_ADDRESS = "support@planet-lab.org"
-    PLC_MAIL_SLICE_ADDRESS = "SLICE@slices.planet-lab.org"
+    PLC_MAIL_SUPPORT_ADDRESS = "root@" + socket.gethostname()
+    PLC_MAIL_SLICE_ADDRESS = "SLICE@" + socket.gethostname()
 
 def format_bytes(bytes, si = True):
     """
@@ -88,11 +86,7 @@ def removepid(prog):
 def slicemail(slice, subject, body):
     sendmail = os.popen("/usr/sbin/sendmail -N never -t -f%s" % PLC_MAIL_SUPPORT_ADDRESS, "w")
 
-    # PLC has a separate list for pl_mom messages
-    if PLC_MAIL_SUPPORT_ADDRESS == "support@planet-lab.org":
-        to = ["pl-mom@planet-lab.org"]
-    else:
-        to = [PLC_MAIL_SUPPORT_ADDRESS]
+    to = [PLC_MAIL_MOM_LIST_ADDRESS]
 
     if slice is not None and slice != "root":
         to.append(PLC_MAIL_SLICE_ADDRESS.replace("SLICE", slice))