X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fwrapper%2Fmailer.py;h=ace997133effa27c1fafe2fdc8bfe16a964fe759;hb=0fabfc8dbe8f1f2c0d12397e1bc8c6ed686fb5ed;hp=cf09be1b16ebc785e453386200adc5db4bc0a67b;hpb=19414270cf2c8429daab02fdebbd8081d9ba0db0;p=monitor.git

diff --git a/monitor/wrapper/mailer.py b/monitor/wrapper/mailer.py
index cf09be1..ace9971 100755
--- a/monitor/wrapper/mailer.py
+++ b/monitor/wrapper/mailer.py
@@ -16,7 +16,7 @@ import time
 logger = logging.getLogger("monitor")
 
 MTA="localhost"
-FROM="monitor@planet-lab.org"
+FROM=config.email
 
 def reformat_for_rt(text):
 	lines = text.split("\n")
@@ -216,9 +216,9 @@ def emailViaRT_NoTicket(subject, text, to):
 	# NOTE: AdminCc: (in PLC's RT configuration) gets an email sent.
 	# This is not the case (surprisingly) for Cc:
 	input_text  = "Subject: %s\n"
-	input_text += "Requestor: monitor@planet-lab.org\n"
+	input_text += "Requestor: %s\n"% FROM
 	input_text += "id: ticket/new\n"
-	input_text += "Queue: Monitor\n"
+	input_text += "Queue: %s\n" % config.RT_QUEUE
 	for recipient in to:
 		input_text += "AdminCc: %s\n" % recipient
 	input_text += "Text: %s"
@@ -286,7 +286,7 @@ def email(subject, text, to):
 	if config.bcc and not config.debug:
 		writer.addheader("Bcc", config.email)
 
-	writer.addheader("Reply-To", 'monitor@planet-lab.org')
+	writer.addheader("Reply-To", FROM)
 		
 	writer.addheader("MIME-Version", "1.0")
 	#
@@ -357,7 +357,7 @@ if __name__=="__main__":
 	#	  "soltesz@cs.utk.edu")
 	email("Re: [PL #21323] TEST 7", 
 			   mailtxt.newbootcd_one[1] % {'hostname_list':"hostname list..."},
-			   ['monitor@planet-lab.org'])
+			   [FROM])
 	#print "ticketid: %d" % id
 	#id = plc.siteId(["alice.cs.princeton.edu"])
 	#print id