Fixing evaluation of mail configs in class DpxPuppetConfig

diff --git a/lib/dpx_puppettools/config.py b/lib/dpx_puppettools/config.py
index 23b1950491f0c8aee4211f0e8e61d796fd38abac..a75404859ef08238aefff84e1f1fa8bde91ac749 100644 (file)
--- a/lib/dpx_puppettools/config.py
+++ b/lib/dpx_puppettools/config.py
@@ -86,7 +86,7 @@ class DpxPuppetConfig(BaseMultiConfig):
     default_mail_from_complete = '{n} <{m}>'.format(n=current_user_gecos, m=default_mail_from)
 
     valid_mail_methods = VALID_MAIL_METHODS
-    default_mail_method = 'smtp'
+    default_mail_method = 'sendmail'
 
     re_whitespace = re.compile(r'(?:[,;]+|\s*[,;]*\s+)+')
 
@@ -187,9 +187,6 @@ class DpxPuppetConfig(BaseMultiConfig):
     # -------------------------------------------------------------------------
     def eval(self):
 
-        self.mail_recipients = []
-        self.mail_cc = []
-
         super(DpxPuppetConfig, self).eval()
 
         if not self.mail_recipients:
@@ -329,7 +326,9 @@ class DpxPuppetConfig(BaseMultiConfig):
     # -------------------------------------------------------------------------
     def _eval_mail_rcpt(self, section_name, section):
 
-        re_rcpt = re.compile(r'^\s*(mail[_-]?)?(recipients?|rcpt)\s*$', re.IGNORECASE)
+        re_rcpt = re.compile(r'^\s*(mail[_-]?)?(recipients?|rcpt|to)\s*$', re.IGNORECASE)
+
+        self.mail_recipients = []
 
         for key in section.keys():
             if not re_rcpt.search(key):
@@ -342,17 +341,19 @@ class DpxPuppetConfig(BaseMultiConfig):
                 for v in val:
                     result = self._split_mailaddress_tokens(v, _("recipient mail address"))
                     if result:
-                        self.mail_recipients.expand(result)
+                        self.mail_recipients += result
             else:
                 result = self._split_mailaddress_tokens(val, _("recipient mail address"))
                 if result:
-                    self.mail_recipients.expand(result)
+                    self.mail_recipients += result
 
     # -------------------------------------------------------------------------
     def _eval_mail_cc(self, section_name, section):
 
         re_cc = re.compile(r'^\s*(mail[_-]?)?cc\s*$', re.IGNORECASE)
 
+        self.mail_cc = []
+
         for key in section.keys():
 
             self.mail_cc_configured = True
@@ -366,11 +367,11 @@ class DpxPuppetConfig(BaseMultiConfig):
                 for v in val:
                     result = self._split_mailaddress_tokens(v, _("cc mail address"))
                     if result:
-                        self.mail_cc.expand(result)
+                        self.mail_cc += result
             else:
                 result = self._split_mailaddress_tokens(val, _("cc mail address"))
                 if result:
-                    self.mail_cc.expand(result)
+                    self.mail_cc += result
 
     # -------------------------------------------------------------------------
     def _eval_mail_reply_to(self, section_name, section):