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

Use version() instad of version_compare() 

This changed in Ansible 2.5 apparently.

See: https://docs.ansible.com/ansible/latest/user_guide/playbooks_tests.html
This commit is contained in:
Alan Orth 2020-03-09 15:20:51 +02:00
parent d78015c92c
commit 2dc195b33c
Signed by: alanorth
GPG Key ID: 0FB860CC9C45B1B9
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
roles/common/tasks/firewall_Debian.yml
View File

@ -10,11 +10,11 @@
- 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_major_version is version_compare('9', '>=') when: ansible_distribution_major_version is version('9', '>=')
apt: pkg={{ debian_firewall_packages }} state=present apt: pkg={{ debian_firewall_packages }} state=present
- name: Use iptables backend in firewalld - name: Use iptables backend in firewalld
when: ansible_distribution_major_version is version_compare('10', '>=') when: ansible_distribution_major_version is version('10', '>=')
lineinfile: lineinfile:
dest: /etc/firewalld/firewalld.conf dest: /etc/firewalld/firewalld.conf
regexp: '^FirewallBackend=nftables$' regexp: '^FirewallBackend=nftables$'
@ -26,7 +26,7 @@
# backend. Using individual calls seems to work around it. # backend. Using individual calls seems to work around it.
# See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=931722 # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=931722
- name: Use individual iptables calls - name: Use individual iptables calls
when: ansible_distribution_major_version is version_compare('10', '>=') when: ansible_distribution_major_version is version('10', '>=')
lineinfile: lineinfile:
dest: /etc/firewalld/firewalld.conf dest: /etc/firewalld/firewalld.conf
regexp: '^IndividualCalls=no$' regexp: '^IndividualCalls=no$'
@ -35,17 +35,17 @@
- restart firewalld - restart firewalld
- name: Copy firewalld public zone file - name: Copy firewalld public zone file
when: ansible_distribution_major_version is version_compare('9', '>=') when: ansible_distribution_major_version is version('9', '>=')
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_major_version is version_compare('9', '>=') when: ansible_distribution_major_version is version('9', '>=')
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('9', '>=') when: ansible_distribution_major_version is version('9', '>=')
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
@ -54,7 +54,7 @@
- restart firewalld - restart firewalld
- include_tasks: fail2ban.yml - include_tasks: fail2ban.yml
when: ansible_distribution_major_version is version_compare('9', '>=') when: ansible_distribution_major_version is version('9', '>=')
tags: firewall tags: firewall
# vim: set sw=2 ts=2: # vim: set sw=2 ts=2:

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('16.04', '>=') when: ansible_distribution_version is version('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('16.04', '>=') when: ansible_distribution_version is version('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('16.04', '>=') when: ansible_distribution_version is version('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('16.04', '>=') when: ansible_distribution_major_version is version('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('16.04', '>=') when: ansible_distribution_version is version('16.04', '>=')
tags: firewall tags: firewall
# vim: set sw=2 ts=2: # vim: set sw=2 ts=2:

4
roles/common/templates/etc/systemd/system/fail2ban.service.d/override.conf.j2
View File

@ -2,14 +2,14 @@
PrivateDevices=yes PrivateDevices=yes
PrivateTmp=yes PrivateTmp=yes
ProtectHome=read-only ProtectHome=read-only
{% if ansible_distribution == 'Ubuntu' and ansible_distribution_major_version is version_compare('18','==') %} {% if ansible_distribution == 'Ubuntu' and ansible_distribution_major_version is version('18','==') %}
ProtectSystem=strict ProtectSystem=strict
{% else %} {% else %}
{# Older systemd versions don't have ProtectSystem=strict #} {# Older systemd versions don't have ProtectSystem=strict #}
ProtectSystem=full ProtectSystem=full
{% endif %} {% endif %}
NoNewPrivileges=yes NoNewPrivileges=yes
{% if ansible_distribution == 'Ubuntu' and ansible_distribution_major_version is version_compare('18','==') %} {% if ansible_distribution == 'Ubuntu' and ansible_distribution_major_version is version('18','==') %}
ReadWritePaths=-/var/run/fail2ban ReadWritePaths=-/var/run/fail2ban
ReadWritePaths=-/var/lib/fail2ban ReadWritePaths=-/var/lib/fail2ban
ReadWritePaths=-/var/log/fail2ban.log ReadWritePaths=-/var/log/fail2ban.log

8
roles/nginx/tasks/letsencrypt.yml
View File

@ -17,7 +17,7 @@
# Dependencies certbot checks for on its first run. I set them in a fact so that # Dependencies certbot checks for on its first run. I set them in a fact so that
# I can pass the list directly to the apt module to install in one transaction. # I can pass the list directly to the apt module to install in one transaction.
- name: Set certbot dependencies (Debian 10) - name: Set certbot dependencies (Debian 10)
when: ansible_distribution == 'Debian' and ansible_distribution_major_version is version_compare('10', '==') when: ansible_distribution == 'Debian' and ansible_distribution_major_version is version('10', '==')
set_fact: set_fact:
certbot_dependencies: certbot_dependencies:
- augeas-lenses - augeas-lenses
@ -68,7 +68,7 @@
# Dependencies certbot checks for on its first run. I set them in a fact so that # Dependencies certbot checks for on its first run. I set them in a fact so that
# I can pass the list directly to the apt module to install in one transaction. # I can pass the list directly to the apt module to install in one transaction.
- name: Set certbot dependencies (Debian 9) - name: Set certbot dependencies (Debian 9)
when: ansible_distribution == 'Debian' and ansible_distribution_major_version is version_compare('9', '==') when: ansible_distribution == 'Debian' and ansible_distribution_major_version is version('9', '==')
set_fact: set_fact:
certbot_dependencies: certbot_dependencies:
- augeas-doc - augeas-doc
@ -120,7 +120,7 @@
# Dependencies certbot checks for on its first run. I set them in a fact so that # Dependencies certbot checks for on its first run. I set them in a fact so that
# I can pass the list directly to the apt module to install in one transaction. # I can pass the list directly to the apt module to install in one transaction.
- name: Set certbot dependencies (Ubuntu 16.04) - name: Set certbot dependencies (Ubuntu 16.04)
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('16.04', '==') when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('16.04', '==')
set_fact: set_fact:
certbot_dependencies: certbot_dependencies:
- augeas-doc - augeas-doc
@ -163,7 +163,7 @@
# Dependencies certbot checks for on its first run. I set them in a fact so that # Dependencies certbot checks for on its first run. I set them in a fact so that
# I can pass the list directly to the apt module to install in one transaction. # I can pass the list directly to the apt module to install in one transaction.
- name: Set certbot dependencies (Ubuntu 18.04) - name: Set certbot dependencies (Ubuntu 18.04)
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('18.04', '==') when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('18.04', '==')
set_fact: set_fact:
certbot_dependencies: certbot_dependencies:
- augeas-lenses - augeas-lenses

6
roles/nginx/templates/vhost.conf.j2
View File

@ -64,11 +64,11 @@ server {
fastcgi_param HTTP_PROXY ""; fastcgi_param HTTP_PROXY "";
{# As of Ubuntu 16.04 and Debian 9, the PHP-FPM configs are the same #} {# As of Ubuntu 16.04 and Debian 9, the PHP-FPM configs are the same #}
{% if (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('16.04', '==')) or (ansible_distribution == 'Debian' and ansible_distribution_major_version is version_compare('9', '==')) %} {% if (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('16.04', '==')) or (ansible_distribution == 'Debian' and ansible_distribution_major_version is version('9', '==')) %}
fastcgi_pass unix:/run/php/php7.0-fpm-{{ domain_name }}.sock; fastcgi_pass unix:/run/php/php7.0-fpm-{{ domain_name }}.sock;
{% elif ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('18.04', '==') %} {% elif ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('18.04', '==') %}
fastcgi_pass unix:/run/php/php7.2-fpm-{{ domain_name }}.sock; fastcgi_pass unix:/run/php/php7.2-fpm-{{ domain_name }}.sock;
{% elif ansible_distribution == 'Debian' and ansible_distribution_version is version_compare('10', '==') %} {% elif ansible_distribution == 'Debian' and ansible_distribution_version is version('10', '==') %}
fastcgi_pass unix:/run/php/php7.3-fpm-{{ domain_name }}.sock; fastcgi_pass unix:/run/php/php7.3-fpm-{{ domain_name }}.sock;
{% else %} {% else %}
fastcgi_pass unix:/var/run/php5-fpm-{{ domain_name }}.sock; fastcgi_pass unix:/var/run/php5-fpm-{{ domain_name }}.sock;

6
roles/php-fpm/tasks/main.yml
View File

@ -5,17 +5,17 @@
- name: Configure php-fpm on Ubuntu 16.04 and Debian 9 - name: Configure php-fpm on Ubuntu 16.04 and Debian 9
include_tasks: Ubuntu.yml include_tasks: Ubuntu.yml
when: (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('16.04', '==')) or (ansible_distribution == 'Debian' and ansible_distribution_major_version is version_compare('9', '==')) when: (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('16.04', '==')) or (ansible_distribution == 'Debian' and ansible_distribution_major_version is version('9', '=='))
tags: php-fpm tags: php-fpm
- name: Configure php-fpm on Ubuntu 18.04 - name: Configure php-fpm on Ubuntu 18.04
include_tasks: Ubuntu_18.04.yml include_tasks: Ubuntu_18.04.yml
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('18.04', '==') when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('18.04', '==')
tags: php-fpm tags: php-fpm
- name: Configure php-fpm on Debian 10 - name: Configure php-fpm on Debian 10
include_tasks: Debian_10.yml include_tasks: Debian_10.yml
when: ansible_distribution == 'Debian' and ansible_distribution_version is version_compare('10', '==') when: ansible_distribution == 'Debian' and ansible_distribution_version is version('10', '==')
tags: php-fpm tags: php-fpm
# vim: set ts=2 sw=2: # vim: set ts=2 sw=2: