summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Saulnier <fantom@fedoraproject.org>2018-11-03 23:42:14 +0100
committerMatthieu Saulnier <fantom@fedoraproject.org>2018-11-03 23:42:14 +0100
commit136347dfb5fcdcbf3b260ad7aa2dd3e6ac2378da (patch)
tree073252751388a74aae33a0c2ec3061c3af30dace
parent0130c771a5476893cdb468a518fcd616ed86ef88 (diff)
downloadplaybooks-ansible-136347dfb5fcdcbf3b260ad7aa2dd3e6ac2378da.tar.gz
playbooks-ansible-136347dfb5fcdcbf3b260ad7aa2dd3e6ac2378da.tar.xz
playbooks-ansible-136347dfb5fcdcbf3b260ad7aa2dd3e6ac2378da.zip
Fix firewall task condition
-rw-r--r--roles/bittorrent/tasks/fw.yml1
-rw-r--r--roles/dnsserver/tasks/fw.yml1
-rw-r--r--roles/mtaserver/tasks/fw.yml4
-rw-r--r--roles/ntpserver/tasks/fw.yml1
-rw-r--r--roles/reverseproxy/tasks/fw.yml1
-rw-r--r--roles/torrelay/tasks/fw.yml4
6 files changed, 4 insertions, 8 deletions
diff --git a/roles/bittorrent/tasks/fw.yml b/roles/bittorrent/tasks/fw.yml
index 3749a01..f98f47e 100644
--- a/roles/bittorrent/tasks/fw.yml
+++ b/roles/bittorrent/tasks/fw.yml
@@ -3,4 +3,3 @@
with_items:
- true
- false
- when: ansible_distribution == "Fedora"
diff --git a/roles/dnsserver/tasks/fw.yml b/roles/dnsserver/tasks/fw.yml
index fb5e6b6..1f1ed0c 100644
--- a/roles/dnsserver/tasks/fw.yml
+++ b/roles/dnsserver/tasks/fw.yml
@@ -3,4 +3,3 @@
with_items:
- true
- false
- when: ansible_distribution == "Fedora"
diff --git a/roles/mtaserver/tasks/fw.yml b/roles/mtaserver/tasks/fw.yml
index 3129a4d..4d88579 100644
--- a/roles/mtaserver/tasks/fw.yml
+++ b/roles/mtaserver/tasks/fw.yml
@@ -3,11 +3,11 @@
with_items:
- true
- false
- when: ansible_distribution == "Fedora" and is_mtamaster is defined
+ when: is_mtamaster is defined
- name: Ouverture du port Submission
firewalld: service=smtp-submission permanent={{ item }} state=enabled
with_items:
- true
- false
- when: ansible_distribution == "Fedora" and is_mtamaster is defined
+ when: is_mtamaster is defined
diff --git a/roles/ntpserver/tasks/fw.yml b/roles/ntpserver/tasks/fw.yml
index f57ca7d..d25ee39 100644
--- a/roles/ntpserver/tasks/fw.yml
+++ b/roles/ntpserver/tasks/fw.yml
@@ -3,4 +3,3 @@
with_items:
- true
- false
- when: ansible_distribution == "Fedora"
diff --git a/roles/reverseproxy/tasks/fw.yml b/roles/reverseproxy/tasks/fw.yml
index e408577..1e47960 100644
--- a/roles/reverseproxy/tasks/fw.yml
+++ b/roles/reverseproxy/tasks/fw.yml
@@ -7,4 +7,3 @@
with_items:
- http
- https
- when: ansible_distribution == "Fedora"
diff --git a/roles/torrelay/tasks/fw.yml b/roles/torrelay/tasks/fw.yml
index c20cf7e..77a1166 100644
--- a/roles/torrelay/tasks/fw.yml
+++ b/roles/torrelay/tasks/fw.yml
@@ -3,11 +3,11 @@
with_nested:
- [ '9001/tcp', '9030/tcp' ]
- [ 'true', 'false' ]
- when: ansible_distribution == "Fedora" and is_public is defined
+ when: is_public is defined
- name: Ouverture des ports Firewalld spéciaux
firewalld: service={{ item[0] }} permanent={{ item[1] }} state=enabled
with_nested:
- [ 'pop3', 'pop3s' ]
- [ 'true', 'false' ]
- when: ansible_distribution == "Fedora" and is_gardian is defined
+ when: is_gardian is defined