forked from ISTI-ansible-roles/ansible-roles
handle the docker service restart after the iptables service one.
This commit is contained in:
parent
7d8faf3cfa
commit
a7f966b26e
|
@ -20,7 +20,3 @@
|
|||
command: /etc/init.d/iptables-persistent stop
|
||||
ignore_errors: true
|
||||
|
||||
- name: Restart fail2ban
|
||||
service: name=fail2ban state=restarted enabled=yes
|
||||
when: has_fail2ban
|
||||
|
||||
|
|
|
@ -1,15 +1,14 @@
|
|||
---
|
||||
- block:
|
||||
- name: Install the needed iptables packages
|
||||
apt: pkg={{ item }} state=installed
|
||||
with_items:
|
||||
- iptables
|
||||
- iptables-persistent
|
||||
tags: iptables
|
||||
|
||||
- name: Create the /etc/iptables directory when needed
|
||||
file: dest=/etc/iptables state=directory owner=root group=root mode=0755
|
||||
when: is_ubuntu_between_10_04_and_11_04_and_is_debian_6
|
||||
tags: iptables
|
||||
|
||||
- name: Install the IPv4 rules with a different name. Needed by Ubuntu < 12.04
|
||||
template: src=iptables-{{ item }}.j2 dest=/etc/iptables/rules owner=root group=root mode=0640
|
||||
|
@ -17,7 +16,6 @@
|
|||
- rules.v4
|
||||
when: is_ubuntu_between_10_04_and_11_04_and_is_debian_6
|
||||
notify: Start the iptables service on Ubuntu < 12.04
|
||||
tags: [ 'iptables', 'iptables_rules' ]
|
||||
|
||||
- name: Install the IPv4 and IPv6 iptables rules. The IPv6 ones are not used. On precise
|
||||
template: src=iptables-{{ item }}.j2 dest=/etc/iptables/{{ item }} owner=root group=root mode=0640
|
||||
|
@ -26,7 +24,6 @@
|
|||
- rules.v6
|
||||
when: is_precise
|
||||
register: install_iptables_rules_precise
|
||||
tags: [ 'iptables', 'iptables_rules' ]
|
||||
|
||||
- name: Install the IPv4 and IPv6 iptables rules. The IPv6 ones are not used. On trusty
|
||||
template: src=iptables-{{ item }}.j2 dest=/etc/iptables/{{ item }} owner=root group=root mode=0640
|
||||
|
@ -35,7 +32,6 @@
|
|||
- rules.v6
|
||||
when: is_trusty
|
||||
register: install_iptables_rules_trusty
|
||||
tags: [ 'iptables', 'iptables_rules' ]
|
||||
|
||||
- name: Install the IPv4 and IPv6 iptables rules. The IPv6 ones are not used. On debian 7
|
||||
template: src=iptables-{{ item }}.j2 dest=/etc/iptables/{{ item }} owner=root group=root mode=0640
|
||||
|
@ -44,7 +40,6 @@
|
|||
- rules.v6
|
||||
when: is_debian7
|
||||
register: install_iptables_rules_deb7
|
||||
tags: [ 'iptables', 'iptables_rules' ]
|
||||
|
||||
- name: Install the IPv4 and IPv6 iptables rules. The IPv6 ones are not used. On debian 8
|
||||
template: src=iptables-{{ item }}.j2 dest=/etc/iptables/{{ item }} owner=root group=root mode=0640
|
||||
|
@ -53,7 +48,6 @@
|
|||
- rules.v6
|
||||
when: is_debian8
|
||||
register: install_netfilter_rules
|
||||
tags: [ 'iptables', 'iptables_rules' ]
|
||||
|
||||
- name: Install the IPv4 and IPv6 iptables rules. The IPv6 ones are not used. On Ubuntu >= 16.04
|
||||
template: src=iptables-{{ item }}.j2 dest=/etc/iptables/{{ item }} owner=root group=root mode=0640
|
||||
|
@ -64,28 +58,42 @@
|
|||
- ansible_distribution == 'Ubuntu'
|
||||
- ansible_distribution_major_version >= '16'
|
||||
register: install_netfilter_rules
|
||||
tags: [ 'iptables', 'iptables_rules' ]
|
||||
|
||||
- name: Start the iptables service immediately after the new rules have been installed, on Ubuntu precise. This can have an impact on other tasks
|
||||
service: name=iptables-persistent state=restarted enabled=yes
|
||||
notify: Restart fail2ban
|
||||
when: ( install_iptables_rules_precise | changed )
|
||||
tags: [ 'iptables', 'iptables_rules' ]
|
||||
register: restart_related
|
||||
when: install_iptables_rules_precise is changed
|
||||
|
||||
- name: Start the iptables service immediately after the new rules have been installed, on Ubuntu Trusty. This can have an impact on other tasks
|
||||
service: name=iptables-persistent state=restarted enabled=yes
|
||||
notify: Restart fail2ban
|
||||
when: ( install_iptables_rules_trusty | changed )
|
||||
tags: [ 'iptables', 'iptables_rules' ]
|
||||
register: restart_related
|
||||
when: install_iptables_rules_trusty is changed
|
||||
|
||||
- name: Start the iptables service immediately after the new rules have been installed, on Debian 7. This can have an impact on other tasks
|
||||
service: name=iptables-persistent state=restarted enabled=yes
|
||||
notify: Restart fail2ban
|
||||
when: ( install_iptables_rules_deb7 | changed )
|
||||
tags: [ 'iptables', 'iptables_rules' ]
|
||||
register: restart_related
|
||||
when: install_iptables_rules_deb7 is changed
|
||||
|
||||
- name: Start the netfilter service immediately after the new rules have been installed. This can have an impact on other tasks
|
||||
service: name=netfilter-persistent state=restarted enabled=yes
|
||||
notify: Restart fail2ban
|
||||
when: ( install_netfilter_rules | changed )
|
||||
register: restart_related
|
||||
when: install_netfilter_rules is changed
|
||||
|
||||
- name: Restart fail2ban after an iptables restart
|
||||
service: name=fail2ban state=restarted enabled=yes
|
||||
when:
|
||||
- has_fail2ban
|
||||
- restart_related is changed
|
||||
|
||||
- name: Check if the docker service is present
|
||||
stat: path=/usr/bin/dockerd
|
||||
register: dockerd_installed
|
||||
when: restart_related is changed
|
||||
|
||||
- name: Restart docker after an iptables restart
|
||||
service: name=docker state=restarted enabled=yes
|
||||
when:
|
||||
- dockerd_installed.stat.exists
|
||||
- restart_related is changed
|
||||
|
||||
tags: [ 'iptables', 'iptables_rules' ]
|
||||
|
|
Loading…
Reference in New Issue