yum-cron: replace 'localhost' with system_name value in email_from. B…

…Z 1330670
rpm-software-management · Jun 30, 2016 · 8bc8251 · 8bc8251
1 parent 94e1366
commit 8bc8251
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/etc/yum-cron-hourly.conf b/etc/yum-cron-hourly.conf
@@ -47,6 +47,7 @@ output_width = 80
 
 [email]
 # The address to send email messages from.
+# NOTE: 'localhost' will be replaced with the value of system_name.
 email_from = root
 
 # List of addresses to send messages to.

diff --git a/etc/yum-cron-security.conf b/etc/yum-cron-security.conf
@@ -50,6 +50,7 @@ output_width = 80
 
 [email]
 # The address to send email messages from.
+# NOTE: 'localhost' will be replaced with the value of system_name.
 email_from = root
 
 # List of addresses to send messages to.

diff --git a/etc/yum-cron.conf b/etc/yum-cron.conf
@@ -49,6 +49,7 @@ output_width = 80
 
 [email]
 # The address to send email messages from.
+# NOTE: 'localhost' will be replaced with the value of system_name.
 email_from = root@localhost
 
 # List of addresses to send messages to.

diff --git a/yum-cron/yum-cron.py b/yum-cron/yum-cron.py
@@ -236,7 +236,7 @@ def sendMessages(self):
  charset = 'us-ascii'
  msg = MIMEText(output, 'plain', charset)
  msg['Subject'] = self.subject
- msg['From'] = self.opts.email_from
+ msg['From'] = self.opts.email_from.replace('localhost', self.opts.system_name)
  msg['To'] = ",".join(self.opts.email_to)
 
  # Send the email