alanorth/ansible-personal
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

roles/common: Bump version checks to Ubuntu 16.04

Browse Source
This commit is contained in:
Alan Orth 2019-10-26 16:40:14 +02:00
parent 9db104efa6
commit 4710ee6f07
Signed by: alanorth
GPG Key ID: 0FB860CC9C45B1B9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
roles/common/tasks/firewall_Ubuntu.yml
View File

@ -10,21 +10,21 @@
- python3-systemd # for fail2ban systemd backend - python3-systemd # for fail2ban systemd backend
- name: Install firewalld and deps - name: Install firewalld and deps
when: ansible_distribution_version is version_compare('15.04', '>=') when: ansible_distribution_version is version_compare('16.04', '>=')
apt: pkg={{ ubuntu_firewall_packages }} state=present apt: pkg={{ ubuntu_firewall_packages }} state=present
- name: Copy firewalld public zone file - name: Copy firewalld public zone file
when: ansible_distribution_version is version_compare('15.04', '>=') when: ansible_distribution_version is version_compare('16.04', '>=')
template: src=public.xml.j2 dest=/etc/firewalld/zones/public.xml owner=root mode=0600 template: src=public.xml.j2 dest=/etc/firewalld/zones/public.xml owner=root mode=0600
- name: Format public.xml firewalld zone file - name: Format public.xml firewalld zone file
when: ansible_distribution_version is version_compare('15.04', '>=') when: ansible_distribution_version is version_compare('16.04', '>=')
command: tidy -xml -iq -m -w 0 /etc/firewalld/zones/public.xml command: tidy -xml -iq -m -w 0 /etc/firewalld/zones/public.xml
notify: notify:
- restart firewalld - restart firewalld
- name: Copy ipsets of abusive IPs - name: Copy ipsets of abusive IPs
when: ansible_distribution_major_version is version_compare('15.04', '>=') when: ansible_distribution_major_version is version_compare('16.04', '>=')
copy: src={{ item }} dest=/etc/firewalld/ipsets/{{ item }} owner=root group=root mode=0600 copy: src={{ item }} dest=/etc/firewalld/ipsets/{{ item }} owner=root group=root mode=0600
loop: loop:
- abusers-ipv4.xml - abusers-ipv4.xml
@ -33,7 +33,7 @@
- restart firewalld - restart firewalld
- include_tasks: fail2ban.yml - include_tasks: fail2ban.yml
when: ansible_distribution_version is version_compare('15.04', '>=') when: ansible_distribution_version is version_compare('16.04', '>=')
tags: firewall tags: firewall
# vim: set sw=2 ts=2: # vim: set sw=2 ts=2: