Skip to content

Commit

Permalink
Consistency changes
Browse files Browse the repository at this point in the history
  • Loading branch information
tersmitten committed Mar 9, 2016
1 parent d345c6e commit 803c10f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ None
* `postfix_hostname` [default: `{{ ansible_fqdn }}`]: Host name, used for `myhostname` and in `mydestination`
* `postfix_mailname` [default: `{{ ansible_fqdn }}`]: Mail name (in `/etc/mailname`), used for `myorigin`
* `postfix_aliases` [default: `[]`]: Aliases to ensure present in `/etc/aliases`
* `postfix_mynetworks` [default: `127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128`]: The list of "trusted" remote SMTP clients that have more privileges than "strangers".
* `postfix_mynetworks` [default: `['127.0.0.0/8', '[::ffff:127.0.0.0]/104', '[::1]/128']`]: The list of "trusted" remote SMTP clients that have more privileges than "strangers"
* `postfix_inet_interfaces` [default: `all`]: Network interfaces to bind ([see](http://www.postfix.org/postconf.5.html#inet_interfaces))
* `postfix_inet_protocols` [default: `all`]: The Internet protocols Postfix will attempt to use when making or accepting connections ([see](http://www.postfix.org/postconf.5.html#inet_protocols))
* `postfix_relayhost` [default: `false` (no relay host)]: Hostname to relay all email to
Expand All @@ -38,7 +38,7 @@ A simple example that doesn't use SASL relaying:
- postfix
vars:
postfix_aliases:
- { user: root, alias: [email protected] }
- { user: root, alias: [email protected] }
```
Provide the relay host name if you want to enable relaying:
Expand All @@ -49,7 +49,7 @@ Provide the relay host name if you want to enable relaying:
- postfix
vars:
postfix_aliases:
- { user: root, alias: [email protected] }
- { user: root, alias: [email protected] }
postfix_relayhost: mail.yourdomain.org
```
Expand All @@ -61,7 +61,7 @@ For AWS SES support:
- postfix
vars:
postfix_aliases:
- { user: root, alias: [email protected] }
- { user: root, alias: [email protected] }
postfix_relayhost: email-smtp.us-east-1.amazonaws.com
postfix_relaytls: true
# AWS IAM SES credentials (not access key):
Expand Down
4 changes: 2 additions & 2 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ postfix_inet_interfaces: all
postfix_inet_protocols: all
postfix_mynetworks:
- 127.0.0.0/8
- "[::ffff:127.0.0.0]/104"
- "[::1]/128"
- '[::ffff:127.0.0.0]/104'
- '[::1]/128'
2 changes: 1 addition & 1 deletion templates/etc/postfix/main.cf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ myhostname = {{ postfix_hostname }}
alias_maps = hash:/etc/aliases
alias_database = hash:/etc/aliases
mydestination = {{ postfix_hostname }}, localdomain, localhost, localhost.localdomain
mynetworks = {{ postfix_mynetworks|join(' ') }}
mynetworks = {{ postfix_mynetworks | join(' ') }}
mailbox_size_limit = 0
recipient_delimiter = +
inet_interfaces = {{ postfix_inet_interfaces }}
Expand Down

0 comments on commit 803c10f

Please sign in to comment.