Skip to content

Commit 4eb8c3d

Browse files
committed
Merge pull request #19 from Oefenweb/reset-inet-protocols-to-the-postfix-29-default-of-all-to-enable-ipv6
Reset inet protocols to the postfix 29 default of all to enable ipv6
2 parents 871dfc8 + 72390fd commit 4eb8c3d

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ python: "2.7"
44

55
env:
66
- ANSIBLE_VERSION=latest
7+
- ANSIBLE_VERSION=2.0.0.2
8+
- ANSIBLE_VERSION=2.0.0.1
9+
- ANSIBLE_VERSION=2.0.0.0
710
- ANSIBLE_VERSION=1.9.4
811
- ANSIBLE_VERSION=1.9.3
912
- ANSIBLE_VERSION=1.9.2
@@ -48,11 +51,11 @@ script:
4851
- ansible-playbook -i tests/inventory tests/test.yml --syntax-check
4952

5053
# Run the role/playbook with ansible-playbook.
51-
- ansible-playbook -i tests/inventory tests/test.yml --connection=local --sudo -vvvv
54+
- ansible-playbook -i tests/inventory tests/test.yml -vvvv
5255

5356
# Run the role/playbook again, checking to make sure it's idempotent.
5457
- >
55-
ansible-playbook -i tests/inventory tests/test.yml --connection=local --sudo
58+
ansible-playbook -i tests/inventory tests/test.yml
5659
| grep -q 'changed=0.*failed=0'
5760
&& (echo 'Idempotence test: pass' && exit 0)
5861
|| (echo 'Idempotence test: fail' && exit 1)

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ None
1414
* `postfix_hostname` [default: `{{ ansible_fqdn }}`]: Host name, used for `myhostname` and in `mydestination`
1515
* `postfix_mailname` [default: `{{ ansible_fqdn }}`]: Mail name (in `/etc/mailname`), used for `myorigin`
1616
* `postfix_aliases` [default: `[]`]: Aliases to ensure present in `/etc/aliases`
17-
* `postfix_inet_interfaces` [default: `all`]: Network interfaces to bind (Postfix setting: [`inet_interfaces`](http://www.postfix.org/postconf.5.html#inet_interfaces))
17+
* `postfix_inet_interfaces` [default: `all`]: Network interfaces to bind ([see](http://www.postfix.org/postconf.5.html#inet_interfaces))
18+
* `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))
1819
* `postfix_relayhost` [default: `false` (no relay host)]: Hostname to relay all email to
1920
* `postfix_relayhost_port` [default: 587]: Relay port (on `postfix_relayhost`, if set)
2021
* `postfix_relaytls` [default: `false`]: Use TLS when sending with a relay host

defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ postfix_relaytls: false
1515
postfix_sasl_user: "postmaster@{{ ansible_domain }}"
1616
postfix_sasl_password: 'k8+haga4@#pR'
1717
postfix_inet_interfaces: all
18+
postfix_inet_protocols: all

templates/etc/postfix/main.cf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
3636
mailbox_size_limit = 0
3737
recipient_delimiter = +
3838
inet_interfaces = {{ postfix_inet_interfaces }}
39-
inet_protocols = ipv4
39+
inet_protocols = {{ postfix_inet_protocols }}
4040

4141
{% if postfix_relayhost %}
4242
relayhost = [{{ postfix_relayhost }}]:{{ postfix_relayhost_port }}

tests/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# test file for postfix
22
---
33
- hosts: localhost
4-
remote_user: root
4+
connection: local
5+
sudo: true
56
roles:
67
- ../../

0 commit comments

Comments
 (0)