diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-12-23 21:08:00 +0100 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-12-23 21:08:00 +0100 |
| commit | 459eb49e09c072c48b378fa99dd6cbe52671c240 (patch) | |
| tree | b9c5e9d5cb5abb39ccf88e1ec29e6946e954d238 | |
| parent | 2ae4cacbe03a5a0d12904f265507dabf9e1edf46 (diff) | |
| download | playbooks-ansible-459eb49e09c072c48b378fa99dd6cbe52671c240.tar.gz playbooks-ansible-459eb49e09c072c48b378fa99dd6cbe52671c240.tar.xz playbooks-ansible-459eb49e09c072c48b378fa99dd6cbe52671c240.zip | |
Minor fixes:
IPv6 prefix was false
Fix condition in mtaserver role
Add condition for centos compatibility
| -rw-r--r-- | roles/dnsserver/vars/main.yml | 4 | ||||
| -rw-r--r-- | roles/mtaserver/tasks/config.yml | 1 | ||||
| -rw-r--r-- | roles/mtaserver/templates/main.cf.j2 | 6 | ||||
| -rw-r--r-- | roles/torrelay/tasks/config.yml | 1 |
4 files changed, 10 insertions, 2 deletions
diff --git a/roles/dnsserver/vars/main.yml b/roles/dnsserver/vars/main.yml index 02e9d4f..da575e2 100644 --- a/roles/dnsserver/vars/main.yml +++ b/roles/dnsserver/vars/main.yml @@ -8,9 +8,9 @@ whitelist: - 2a01:e35:2f76:7750::/64 - 82.247.103.117 - 178.170.58.2 - - 2a00:c70:1:178:170:58:2:b50d/96 + - 2a00:c70:1:178:170:58:2:b50d/128 - 109.238.2.40 - - 2a00:c70:1:109:238:2:40:bad/96 + - 2a00:c70:1:109:238:2:40:bad/128 - 51.15.179.153 - 2001:bc8:3fec:f00:7ea::/128 - 163.172.211.128 diff --git a/roles/mtaserver/tasks/config.yml b/roles/mtaserver/tasks/config.yml index 7ac1dc5..ecdfe80 100644 --- a/roles/mtaserver/tasks/config.yml +++ b/roles/mtaserver/tasks/config.yml @@ -80,3 +80,4 @@ state: present with_items: - "{{ userlist }}" + when: mtadomain is defined diff --git a/roles/mtaserver/templates/main.cf.j2 b/roles/mtaserver/templates/main.cf.j2 index e257e19..90850f6 100644 --- a/roles/mtaserver/templates/main.cf.j2 +++ b/roles/mtaserver/templates/main.cf.j2 @@ -27,7 +27,11 @@ # # The level below is what should be used with new (not upgrade) installs. # +{% if ansible_distribution == "Fedora" %} compatibility_level = 2 +{% else %} +#compatibility_level = 2 +{% endif %} # SOFT BOUNCE # @@ -793,9 +797,11 @@ message_size_limit = 5368709120 policyd-spf_time_limit = 3600 {% endif %} +{% if ansible_distribution == "Fedora" %} meta_directory = /etc/postfix {% if ansible_architecture == "x86_64" %} shlib_directory = /usr/lib64/postfix {% else %} shlib_directory = /usr/lib/postfix {% endif %} +{% endif %} diff --git a/roles/torrelay/tasks/config.yml b/roles/torrelay/tasks/config.yml index 9847255..7c9c273 100644 --- a/roles/torrelay/tasks/config.yml +++ b/roles/torrelay/tasks/config.yml @@ -3,6 +3,7 @@ src: tor.service dest: /etc/systemd/system/tor.service mode: 0644 + when: ansible_distribution == "Fedora" notify: reload systemd - name: Configuration de proxychains |