Skip to content

Commit

Permalink
Fix email multi-address
Browse files Browse the repository at this point in the history
  • Loading branch information
ggatward committed Dec 11, 2017
1 parent 4e7ec11 commit bf52fa1
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Fixed
- Incorrect mapping of days in auto_content.py
- Support for username:token authentication to Artifactory Puppet Forge server
- Email now supports multiple recipients


## [1.2.0] - 2017-12-10
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ logging:
email:
mailout: True
mailfrom: Satellite 6 <[email protected]>
mailto: [email protected]
mailto:
- [email protected]
export:
dir: /var/sat-export (Directory to export content to - Connected Satellite)
Expand Down
3 changes: 2 additions & 1 deletion config/config.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ logging:
email:
mailout: True
mailfrom: Satellite 6 <[email protected]>
mailto: [email protected]
mailto:
- [email protected]

export:
dir: /var/sat-export
Expand Down
2 changes: 1 addition & 1 deletion helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ def mailout(subject, message):
Assumes localhost is configured for SMTP forwarding (postfix)
"""
sender = MAILFROM
receivers = [MAILTO]
receivers = MAILTO

body = 'From: {}\nSubject: {}\n\n{}'.format(sender, subject, message)

Expand Down
6 changes: 4 additions & 2 deletions man/sat6_scripts.8
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,11 @@ Enable/Disable mailout functionality.
Sender email address envelope.
.RE

.B " mailto: [email protected]
.B " mailto:"
.br
.B " - [email protected]"
.RS
Recipient email address.
List of recipient email addresses.
.RE


Expand Down

0 comments on commit bf52fa1

Please sign in to comment.