roles: use fully qualified module names

roles/common/tasks/firewall_Ubuntu.yml

@@ -6,7 +6,7 @@
 - block:
   - name: Set Ubuntu firewall packages
     when: ansible_distribution_version is version('20.04', '<')
-    set_fact:
+    ansible.builtin.set_fact:
       ubuntu_firewall_packages:
         - firewalld
         - tidy
@@ -15,7 +15,7 @@
 
   - name: Set Ubuntu firewall packages
     when: ansible_distribution_version is version('20.04', '>=')
-    set_fact:
+    ansible.builtin.set_fact:
       ubuntu_firewall_packages:
         - fail2ban
         - libnet-ip-perl # for aggregate-cidr-addresses.pl
@@ -24,26 +24,26 @@
         - curl # for nftables update scripts
 
   - name: Install firewall packages
-    apt: pkg={{ ubuntu_firewall_packages }} state=present cache_valid_time=3600
+    ansible.builtin.apt: pkg={{ ubuntu_firewall_packages }} state=present cache_valid_time=3600
 
   - name: Remove ufw
     when: ansible_distribution_version is version('16.04', '>=')
-    apt: pkg=ufw state=absent
+    ansible.builtin.apt: pkg=ufw state=absent
 
   - name: Copy nftables.conf
     when: ansible_distribution_version is version('20.04', '>=')
-    template: src=nftables.conf.j2 dest=/etc/nftables.conf owner=root mode=0644
+    ansible.builtin.template: src=nftables.conf.j2 dest=/etc/nftables.conf owner=root mode=0644
     notify:
       - restart nftables
       - restart fail2ban
 
   - name: Create /etc/nftables extra config directory
     when: ansible_distribution_version is version('20.04', '>=')
-    file: path=/etc/nftables state=directory owner=root mode=0755
+    ansible.builtin.file: path=/etc/nftables state=directory owner=root mode=0755
 
   - name: Copy extra nftables configuration files
     when: ansible_distribution_version is version('20.04', '>=')
-    copy: src={{ item.src }} dest=/etc/nftables/{{ item.src }} owner=root group=root mode=0644 force={{ item.force }}
+    ansible.builtin.copy: src={{ item.src }} dest=/etc/nftables/{{ item.src }} owner=root group=root mode=0644 force={{ item.force }}
     loop:
       - { src: "spamhaus-ipv4.nft", force: "no" }
       - { src: "spamhaus-ipv6.nft", force: "no" }
@@ -56,7 +56,7 @@
 
   - name: Copy firewalld public zone file
     when: ansible_distribution_version is version('18.04', '<=')
-    template: src=public.xml.j2 dest=/etc/firewalld/zones/public.xml owner=root mode=0600
+    ansible.builtin.template: src=public.xml.j2 dest=/etc/firewalld/zones/public.xml owner=root mode=0600
 
   - name: Format public.xml firewalld zone file
     when: ansible_distribution_version is version('18.04', '<=')
@@ -67,7 +67,7 @@
 
   - name: Copy firewalld ipsets of abusive IPs
     when: ansible_distribution_version is version('18.04', '<=')
-    copy: src={{ item }} dest=/etc/firewalld/ipsets/{{ item }} owner=root group=root mode=0600
+    ansible.builtin.copy: src={{ item }} dest=/etc/firewalld/ipsets/{{ item }} owner=root group=root mode=0600
     loop:
       - abusers-ipv4.xml
       - abusers-ipv6.xml
@@ -79,11 +79,11 @@
 
   - name: Copy Spamhaus firewalld update script
     when: ansible_distribution_version is version('18.04', '<=')
-    copy: src=update-spamhaus-lists.sh dest=/usr/local/bin/update-spamhaus-lists.sh mode=0755 owner=root group=root
+    ansible.builtin.copy: src=update-spamhaus-lists.sh dest=/usr/local/bin/update-spamhaus-lists.sh mode=0755 owner=root group=root
 
   - name: Copy Spamhaus firewalld systemd units
     when: ansible_distribution_version is version('18.04', '<=')
-    copy: src={{ item }} dest=/etc/systemd/system/{{ item }} mode=0644 owner=root group=root
+    ansible.builtin.copy: src={{ item }} dest=/etc/systemd/system/{{ item }} mode=0644 owner=root group=root
     loop:
         - update-spamhaus-lists.service
         - update-spamhaus-lists.timer
@@ -91,7 +91,7 @@
 
   - name: Copy nftables update scripts
     when: ansible_distribution_version is version('20.04', '>=')
-    copy: src={{ item }} dest=/usr/local/bin/{{ item }} mode=0755 owner=root group=root
+    ansible.builtin.copy: src={{ item }} dest=/usr/local/bin/{{ item }} mode=0755 owner=root group=root
     loop:
       - update-spamhaus-nftables.sh
       - aggregate-cidr-addresses.pl
@@ -99,7 +99,7 @@
 
   - name: Copy nftables systemd units
     when: ansible_distribution_version is version('20.04', '>=')
-    copy: src={{ item }} dest=/etc/systemd/system/{{ item }} mode=0644 owner=root group=root
+    ansible.builtin.copy: src={{ item }} dest=/etc/systemd/system/{{ item }} mode=0644 owner=root group=root
     loop:
         - update-spamhaus-nftables.service
         - update-spamhaus-nftables.timer
@@ -109,29 +109,29 @@
 
   # need to reload to pick up service/timer/environment changes
   - name: Reload systemd daemon
-    systemd: daemon_reload=yes
+    ansible.builtin.systemd: daemon_reload=yes
     when: spamhaus_firewalld_systemd_units is changed or
           nftables_systemd_units is changed
 
   - name: Start and enable Spamhaus firewalld update timer
     when: ansible_distribution_version is version('18.04', '<=')
-    systemd: name=update-spamhaus-lists.timer state=started enabled=yes
+    ansible.builtin.systemd: name=update-spamhaus-lists.timer state=started enabled=yes
     notify:
       - restart firewalld
       - restart fail2ban
 
   - name: Start and enable nftables update timers
     when: ansible_distribution_version is version('20.04', '>=')
-    systemd: name={{ item }} state=started enabled=yes
+    ansible.builtin.systemd: name={{ item }} state=started enabled=yes
     loop:
       - update-spamhaus-nftables.timer
       - update-abusech-nftables.timer
 
   - name: Start and enable nftables
     when: ansible_distribution_version is version('20.04', '>=')
-    systemd: name=nftables state=started enabled=yes
+    ansible.builtin.systemd: name=nftables state=started enabled=yes
 
-  - include_tasks: fail2ban.yml
+  - ansible.builtin.include_tasks: fail2ban.yml
     when: ansible_distribution_version is version('16.04', '>=')
   tags: firewall