cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #414 from adematte/patch-2

Browse source 
Update mail.py to allow html content
This commit is contained in:
Greg DeKoenigsberg 2015-06-24 23:35:49 -04:00
commit f28d82ba30
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
notification/mail.py
View file

@ -110,6 +110,11 @@ options:
- The character set of email being sent - The character set of email being sent
default: 'us-ascii' default: 'us-ascii'
required: false required: false
subtype:
description:
- The minor mime type, can be either text or html. The major type is always text.
default: 'plain'
required: false
""" """
EXAMPLES = ''' EXAMPLES = '''
@ -183,7 +188,8 @@ def main():
body = dict(default=None), body = dict(default=None),
attach = dict(default=None), attach = dict(default=None),
headers = dict(default=None), headers = dict(default=None),
charset = dict(default='us-ascii') charset = dict(default='us-ascii'),
subtype = dict(default='plain')
) )
) )
@ -200,6 +206,7 @@ def main():
attach_files = module.params.get('attach') attach_files = module.params.get('attach')
headers = module.params.get('headers') headers = module.params.get('headers')
charset = module.params.get('charset') charset = module.params.get('charset')
subtype = module.params.get('subtype')
sender_phrase, sender_addr = parseaddr(sender) sender_phrase, sender_addr = parseaddr(sender)
if not body: if not body:
@ -259,7 +266,7 @@ def main():
if len(cc_list) > 0: if len(cc_list) > 0:
msg['Cc'] = ", ".join(cc_list) msg['Cc'] = ", ".join(cc_list)
part = MIMEText(body + "\n\n", _charset=charset) part = MIMEText(body + "\n\n", _subtype=subtype, _charset=charset)
msg.attach(part) msg.attach(part)
if attach_files is not None: if attach_files is not None: