Use FQCNs everywhere

roles/dovecot/handlers/main.yml

@@ -1,11 +1,11 @@
 ---
 
 - name: reload dovecot
-  service:
+  ansible.builtin.service:
     name: dovecot
     state: reloaded
 
 - name: restart dovecot
-  service:
+  ansible.builtin.service:
     name: dovecot
     state: restarted

roles/dovecot/tasks/config.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: render /etc/dovecot/dovecot.conf
-  template:
+  ansible.builtin.template:
     src: etc/dovecot/dovecot.conf.j2
     dest: /etc/dovecot/dovecot.conf
     owner: root

roles/dovecot/tasks/install.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: install dovecot packages
-  package:
+  ansible.builtin.apt:
     name: "{{ item }}"
     state: present
   loop:
@@ -12,14 +12,14 @@
     - dovecot-managesieved
 
 - name: add dovecot user to virtual mail group
-  user:
+  ansible.builtin.user:
     name: dovecot
     groups: "{{ virtual_mail_gid }}"
     append: yes
   notify: restart dovecot
 
 - name: start and enable dovecot
-  service:
+  ansible.builtin.service:
     name: dovecot
     state: started
     enabled: yes

roles/dovecot/tasks/main.yml

@@ -1,16 +1,16 @@
 ---
 
-- import_tasks: virtual.yml
+- ansible.builtin.import_tasks: virtual.yml
   tags:
     - "role::dovecot"
     - "role::dovecot:virtual"
 
-- import_tasks: install.yml
+- ansible.builtin.import_tasks: install.yml
   tags:
     - "role::dovecot"
     - "role::dovecot:install"
 
-- import_tasks: config.yml
+- ansible.builtin.import_tasks: config.yml
   tags:
     - "role::dovecot"
     - "role::dovecot:config"

roles/dovecot/tasks/virtual.yml

@@ -1,12 +1,12 @@
 ---
 
 - name: create virtual mail group
-  group:
+  ansible.builtin.group:
     name: "{{ virtual_mail_gid }}"
     system: yes
 
 - name: create virtual mail user
-  user:
+  ansible.builtin.user:
     name: "{{ virtual_mail_uid }}"
     group: "{{ virtual_mail_gid }}"
     home: "{{ virtual_mail_home }}"

roles/easywks/handlers/main.yml

@@ -1,11 +1,11 @@
 ---
 
 - name: restart easywks-http
-  service:
+  ansible.builtin.service:
     name: easywks-http
     state: restarted
 
 - name: restart easywks-lmtp
-  service:
+  ansible.builtin.service:
     name: easywks-lmtp
     state: restarted

roles/easywks/tasks/config.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: render easywks config file
-  template:
+  ansible.builtin.template:
     src: etc/easywks.yml.j2
     dest: /etc/easywks.yml
     owner: root
@@ -12,13 +12,13 @@
     - restart easywks-lmtp
 
 - name: start and enable easywks-http
-  service:
+  ansible.builtin.service:
     name: easywks-http
     state: started
     enabled: "{{ easywks_service_http_enabled }}"
 
 - name: start and enable easywks-lmtp
-  service:
+  ansible.builtin.service:
     name: easywks-lmtp
     state: started
     enabled: "{{ easywks_service_lmtp_enabled }}"

roles/easywks/tasks/install.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: install easywks from system package sources
-  apt:
+  ansible.builtin.apt:
     name: easywks
   notify:
     - restart easywks-http
@@ -9,7 +9,7 @@
   when: "not easywks_download"
 
 - name: get easywks package url
-  uri:
+  ansible.builtin.uri:
     # https://gitlab.com/s3lph/easywks
     url: "https://gitlab.com/api/v4/projects/29907182/releases"
     return_content: yes
@@ -18,7 +18,7 @@
   when: "easywks_download"
 
 - name: install easywks from upstream release
-  apt:
+  ansible.builtin.apt:
     deb: "{{ url }}"
   vars:
     url: "{{ (register_easywks_gitlab_releases.json[0].assets.links | selectattr('name', 'equalto', 'Debian Package'))[0].direct_asset_url }}"

roles/easywks/tasks/main.yml

@@ -1,11 +1,11 @@
 ---
 
-- import_tasks: install.yml
+- ansible.builtin.import_tasks: install.yml
   tags:
     - "role::easywks"
     - "role::easywks:install"
 
-- import_tasks: config.yml
+- ansible.builtin.import_tasks: config.yml
   tags:
     - "role::easywks"
     - "role::easywks:config"

roles/mailman/handlers/main.yml

@@ -1,20 +1,20 @@
 ---
 
 - name: systemctl daemon-reload
-  systemd:
+  ansible.builtin.systemd:
     daemon_reload: yes
 
 - name: restart mailman3
-  service:
+  ansible.builtin.service:
     name : mailman3
     state: restarted
 
 - name: restart mailman3-web
-  service:
+  ansible.builtin.service:
     name : mailman3-web
     state: restarted
 
 - name: reload postfix
-  service:
+  ansible.builtin.service:
     name : postfix
     state: reloaded

roles/mailman/tasks/bootstrap.yml

@@ -62,13 +62,13 @@
 - name: apply mailman-web migrations
   become_user: www-data
   become_method: sudo
-  command: /usr/share/mailman3-web/manage.py migrate
+  ansible.builtin.command: /usr/share/mailman3-web/manage.py migrate
   changed_when: yes
 
 - name: change django default site
   become_user: www-data
   become_method: sudo
-  command: >-
+  ansible.builtin.command: >-
     /usr/share/mailman3-web/manage.py set_default_site
     --name {{ mailman_sitename }}
     --domain {{ mailman_sitename }}
@@ -77,7 +77,7 @@
 - name: create mailman-web superuser
   become_user: www-data
   become_method: sudo
-  command: /usr/share/mailman3-web/manage.py shell
+  ansible.builtin.command: /usr/share/mailman3-web/manage.py shell
   args:
     stdin: |
       from django.contrib.auth.models import User

roles/mailman/tasks/config.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: render /etc/mailman3/mailman.cfg
-  template:
+  ansible.builtin.template:
     src: etc/mailman3/mailman.cfg.j2
     dest: /etc/mailman3/mailman.cfg
     owner: root
@@ -10,7 +10,7 @@
   notify: restart mailman3
 
 - name: render /etc/mailman3/mailman-hyperkitty.cfg
-  template:
+  ansible.builtin.template:
     src: etc/mailman3/mailman-hyperkitty.cfg.j2
     dest: /etc/mailman3/mailman-hyperkitty.cfg
     owner: root
@@ -19,7 +19,7 @@
   notify: restart mailman3
 
 - name: render /etc/mailman3/mailman-web.py
-  template:
+  ansible.builtin.template:
     src: etc/mailman3/mailman-web.py.j2
     dest: /etc/mailman3/mailman-web.py
     owner: root
@@ -28,7 +28,7 @@
   notify: restart mailman3-web
 
 - name: create /etc/postfix/sql directory
-  file:
+  ansible.builtin.file:
     path: /etc/postfix/sql
     state: directory
     owner: root
@@ -36,7 +36,7 @@
     mode: 0755
 
 - name: render postfix sql config file
-  template:
+  ansible.builtin.template:
     src: etc/postfix/sql/mailman_mysql_virtual_domains.cf.j2
     dest: /etc/postfix/sql/mailman_mysql_virtual_domains.cf
     owner: root

roles/mailman/tasks/install.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: install packages
-  apt:
+  ansible.builtin.apt:
     name: "{{ item }}"
     state: present
   loop:
@@ -13,15 +13,23 @@
     - acl
 
 - name: fix permissions on /var/lib/mailman3/data
-  file:
+  ansible.builtin.file:
     path: /var/lib/mailman3/data
     state: directory
     owner: list
     group: list
     mode: 0755
 
+- name: create mailman3 servive override directory
+  ansible.builtin.file:
+    path: /etc/systemd/system/mailman3.service.d
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
+
 - name: override mailman3 service dependencies
-  template:
+  ansible.builtin.template:
     src: etc/systemd/system/mailman3.service.d/override.conf.j2
     dest: /etc/systemd/system/mailman3.service.d/override.conf
     owner: root
@@ -31,17 +39,17 @@
   when: mailman3_service_dependencies is defined
 
 - name: remove mailman3 service dependencies override
-  file:
+  ansible.builtin.file:
     path: /etc/systemd/system/mailman3.service.d/override.conf
     state: absent
   notify: systemctl daemon-reload
   when: mailman3_service_dependencies is not defined
 
 - name: systemctl daemon-reload
-  meta: flush_handlers
+  ansible.builtin.meta: flush_handlers
 
 - name: start and enable mailman
-  service:
+  ansible.builtin.service:
     name: "{{ item }}"
     state: started
     enabled: yes

roles/mailman/tasks/main.yml

@@ -1,25 +1,25 @@
 ---
 
-- import_tasks: install.yml  # todo: wtf dependencies
+- ansible.builtin.import_tasks: install.yml  # todo: wtf dependencies
   tags:
     - "role::mailman"
     - "role::mailman:install"
 
-- import_tasks: config.yml
+- ansible.builtin.import_tasks: config.yml
   tags:
     - "role::mailman"
     - "role::mailman:config"
 
-- import_tasks: templates.yml
+- ansible.builtin.import_tasks: templates.yml
   tags:
     - "role::mailman"
     - "role::mailman:templates"
 
-- import_tasks: bootstrap.yml
+- ansible.builtin.import_tasks: bootstrap.yml
   tags:
     - "role::mailman:bootstrap"
     - "never"
 
-- import_tasks: privacy.yml
+- ansible.builtin.import_tasks: privacy.yml
   tags:
     - "role::mailman:privacy"

roles/mailman/tasks/privacy.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: render mysql client config for cleanup cronjob
-  template:
+  ansible.builtin.template:
     src: root/.mysql.hyperkitty-cleanup.cnf.j2
     dest: /root/.mysql.hyperkitty-cleanup.cnf
     owner: root
@@ -10,7 +10,7 @@
   when: mailman_web_privacy_enhancements
 
 - name: render privacy-enhancing hyperkitty cleanup cronjob
-  template:
+  ansible.builtin.template:
     src: etc/cron.d/hyperkitty-cleanup.j2
     dest: /etc/cron.d/hyperkitty-cleanup
     owner: root

roles/mailman/tasks/templates.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: create /var/lib/mailman3/web/templates
-  file:
+  ansible.builtin.file:
     path: /var/lib/mailman3/web/templates
     state: directory
     owner: www-data
@@ -9,7 +9,7 @@
     mode: 0755
 
 - name: create template override directories
-  file:
+  ansible.builtin.file:
     path: "/var/lib/mailman3/web/templates/{{ item.path }}"
     owner: www-data
     group: www-data
@@ -20,7 +20,7 @@
   notify: restart mailman3-web
 
 - name: render template overrides
-  copy:
+  ansible.builtin.copy:
     src: "{{ item.root }}/{{ item.path }}"
     dest: "/var/lib/mailman3/web/templates/{{ item.path }}"
     owner: www-data

roles/postfix/handlers/main.yml

@@ -1,14 +1,14 @@
 ---
 
 - name: restart postfix
-  service:
+  ansible.builtin.service:
     name: postfix
     state: restarted
 
 - name: reload postfix
-  service:
+  ansible.builtin.service:
     name: postfix
     state: reloaded
 
 - name: postalias /etc/aliases
-  command: postalias /etc/aliases
+  ansible.builtin.command: postalias /etc/aliases

roles/postfix/tasks/config.yml

@@ -1,6 +1,6 @@
 ---
 
-- name: render /etc/postfix/main.cf
+- ansible.builtin.name: render /etc/postfix/main.cf
   template:
     src: etc/postfix/main.cf.j2
     dest: /etc/postfix/main.cf
@@ -9,7 +9,7 @@
     mode: 0644
   notify: restart postfix
 
-- name: render /etc/postfix/master.cf
+- ansible.builtin.name: render /etc/postfix/master.cf
   template:
     src: etc/postfix/master.cf.j2
     dest: /etc/postfix/master.cf

roles/postfix/tasks/main.yml

@@ -1,23 +1,23 @@
 ---
 
-- import_tasks: setup.yml
+- ansible.builtin.import_tasks: setup.yml
   tags:
     - "role::postfix"
     - "role::postfix:install"
     - "role::postfix:config"
     - "role::postfix:tables"
 
-- import_tasks: install.yml
+- ansible.builtin.import_tasks: install.yml
   tags:
     - "role::postfix"
     - "role::postfix:install"
 
-- import_tasks: config.yml
+- ansible.builtin.import_tasks: config.yml
   tags:
     - "role::postfix"
     - "role::postfix:config"
 
-- import_tasks: tables.yml
+- ansible.builtin.import_tasks: tables.yml
   tags:
     - "role::postfix"
     - "role::postfix:tables"

roles/postfix/tasks/setup.yml

@@ -1,14 +1,14 @@
 ---
 
 - name: create virtual mail group
-  group:
+  ansible.builtin.group:
     name: "{{ virtual_mail_gid }}"
     system: yes
   register: postfix_register_vmail_group
   when: postfix_enable_virtual_mail
 
 - name: create virtual mail user
-  user:
+  ansible.builtin.user:
     name: "{{ virtual_mail_uid }}"
     group: "{{ virtual_mail_gid }}"
     home: "{{ virtual_mail_home }}"
@@ -20,7 +20,7 @@
   when: postfix_enable_virtual_mail
 
 - name: set vmail uid and gid facts
-  set_fact:
+  ansible.builtin.set_fact:
     virtual_mail_numeric_uid: "{{ postfix_register_vmail_user.uid }}"
     virtual_mail_numeric_gid: "{{ postfix_register_vmail_group.gid }}"
   when: postfix_enable_virtual_mail

roles/postfix/tasks/tables.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: render /etc/aliases
-  template:
+  ansible.builtin.template:
     src: etc/aliases.j2
     dest: /etc/aliases
     owner: root
@@ -10,7 +10,7 @@
   notify: postalias /etc/aliases
 
 - name: render additional hash lookup tables
-  template:
+  ansible.builtin.template:
     src: etc/postfix/table.j2
     dest: "/etc/postfix/{{ item.key }}"
     owner: root
@@ -20,7 +20,7 @@
   loop: "{{ postfix_additional_tables | dict2items }}"
 
 - name: postmap additional lookup tables
-  command: >-
+  ansible.builtin.command: >-
     postmap /etc/postfix/{{ item.item.key }}
   changed_when: yes
   loop: "{{ postfix_register_additional_lookup_tables.results }}"

roles/postfixadmin/tasks/main.yml

@@ -1,31 +1,31 @@
 ---
 
-- import_tasks: setup.yml
+- ansible.builtin.import_tasks: setup.yml
   tags:
     - "role::postfixadmin"
     - "role::postfixadmin:dovecot"
 
-- import_tasks: install.yml
+- ansible.builtin.import_tasks: install.yml
   tags:
     - "role::postfixadmin"
     - "role::postfixadmin:install"
 
-- import_tasks: config.yml
+- ansible.builtin.import_tasks: config.yml
   tags:
     - "role::postfixadmin"
     - "role::postfixadmin:config"
 
-- import_tasks: bootstrap.yml
+- ansible.builtin.import_tasks: bootstrap.yml
   tags:
     - "role::postfixadmin:bootstrap"
     - "never"
 
-- import_tasks: postfix.yml
+- ansible.builtin.import_tasks: postfix.yml
   tags:
     - "role::postfixadmin"
     - "role::postfixadmin:postfix"
 
-- import_tasks: dovecot.yml
+- ansible.builtin.import_tasks: dovecot.yml
   tags:
     - "role::postfixadmin"
     - "role::postfixadmin:dovecot"

roles/postsrsd/handlers/main.yml

@@ -1,6 +1,6 @@
 ---
 
 - name: restart postsrsd
-  service:
+  ansible.builtin.service:
     name: postsrsd
     state: restarted

roles/postsrsd/tasks/config.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: render /etc/default/postsrsd
-  template:
+  ansible.builtin.template:
     src: etc/default/postsrsd.j2
     dest: /etc/default/postsrsd
     owner: root

roles/postsrsd/tasks/install.yml

@@ -1,12 +1,12 @@
 ---
 
 - name: install postsrsd
-  apt:
+  ansible.builtin.apt:
     name: postsrsd
     state: present
 
 - name: start and enable postsrsd
-  service:
+  ansible.builtin.service:
     name: postsrsd
     state: started
     enabled: yes

roles/postsrsd/tasks/main.yml

@@ -1,11 +1,11 @@
 ---
 
-- import_tasks: install.yml
+- ansible.builtin.import_tasks: install.yml
   tags:
     - "role::postsrsd"
     - "role::postsrsd:install"
 
-- import_tasks: config.yml
+- ansible.builtin.import_tasks: config.yml
   tags:
     - "role::postsrsd"
     - "role::postsrsd:config"

roles/schleuder/handlers/main.yml

@@ -1,15 +1,15 @@
 ---
 
 - name: systemctl daemon-reload
-  systemd:
+  ansible.builtin.systemd:
     daemon_reload: yes
 
 - name: systemctl restart schleuder-web
-  service:
+  ansible.builtin.service:
     name: schleuder-web
     state: restarted
     
 - name: systemctl restart schleuder-api-daemon
-  service:
+  ansible.builtin.service:
     name: schleuder-api-daemon
     state: restarted

roles/schleuder/tasks/cli_apitokens.yml

@@ -6,7 +6,7 @@
   register: schleuder_register_apicert_info
 
 - name: create the ~/.schleuder-cli/ directory
-  file:
+  ansible.builtin.file:
     path: "{{ item.value.home }}/.schleuder-cli"
     state: directory
     owner: "{{ item.key }}"
@@ -14,7 +14,7 @@
   loop: "{{ schleuder_cli_users | dict2items }}"
 
 - name: render ~/.schleuder-cli/schleuder-cli.yml
-  template:
+  ansible.builtin.template:
     src: root/.schleuder-cli/schleuder-cli.yml.j2
     dest: "{{ item.value.home }}/.schleuder-cli/schleuder-cli.yml"
     owner: "{{ item.key }}"

roles/schleuder/tasks/config.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: render /etc/schleuder/schleuder.yml
-  template:
+  ansible.builtin.template:
     src: etc/schleuder/schleuder.yml.j2
     dest: /etc/schleuder/schleuder.yml
     owner: root
@@ -10,7 +10,7 @@
   notify: systemctl restart schleuder-api-daemon
 
 - name: render /etc/schleuder/list-defaults.yml
-  template:
+  ansible.builtin.template:
     src: etc/schleuder/list-defaults.yml.j2
     dest: /etc/schleuder/list-defaults.yml
     owner: root

roles/schleuder/tasks/install.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: install schleuder packages
-  apt:
+  ansible.builtin.apt:
     name:
       - schleuder
       - schleuder-cli

roles/schleuder/tasks/install_schleuder.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: install schleuder-web dependencies
-  apt:
+  ansible.builtin.apt:
     name:
       - ruby
       - ruby-dev
@@ -11,12 +11,12 @@
       - acl  # only needed so ansible can become_user=schleuder
 
 - name: create schleuder group
-  group:
+  ansible.builtin.group:
     name: schleuder
     system: yes
   
 - name: create schleuder user
-  user:
+  ansible.builtin.user:
     name: schleuder
     group: schleuder
     home: /var/lib/schleuder
@@ -24,10 +24,10 @@
     shell: /usr/sbin/nologin
   
 - name: gather service facts
-  service_facts:
+  ansible.builtin.service_facts:
 
 - name: stop schleuder service
-  service:
+  ansible.builtin.service:
     name: schleuder
     state: stopped
   when: "'schleuder.service' in ansible_facts.services"
@@ -35,6 +35,6 @@
 - name: install schleuder gem
   become: yes
   become_user: schleuder
-  command:
+  ansible.builtin.command:
     cmd: gem install schleuder
     creates: /var/lib/schleuder-web/schleuder-web

roles/schleuder/tasks/install_web.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: install schleuder-web dependencies
-  apt:
+  ansible.builtin.apt:
     name:
       - bundler
       - libxml2-dev
@@ -11,7 +11,7 @@
       - acl  # only needed so ansible can become_user=schleuder-web
 
 - name: create schleuder-web user
-  user:
+  ansible.builtin.user:
     name: schleuder-web
     group: nogroup
     home: /var/lib/schleuder-web
@@ -19,10 +19,10 @@
     shell: /usr/sbin/nologin
   
 - name: gather service facts
-  service_facts:
+  ansible.builtin.service_facts:
 
 - name: stop schleuder-web service
-  service:
+  ansible.builtin.service:
     name: schleuder-web
     state: stopped
   when: "'schleuder-web.service' in ansible_facts.services"
@@ -30,14 +30,14 @@
 - name: clone schleuder-web git repo
   become: yes
   become_user: schleuder-web
-  command:
+  ansible.builtin.command:
     cmd: git clone https://0xacab.org/schleuder/schleuder-web /var/lib/schleuder-web/schleuder-web  # noqa command-instead-of-module git module would reset working directory
     creates: /var/lib/schleuder-web/schleuder-web
     
 - name: fetch schleuder-web upstream
   become: yes
   become_user: schleuder-web
-  command:
+  ansible.builtin.command:
     cmd: git fetch origin  # noqa command-instead-of-module
     chdir: /var/lib/schleuder-web/schleuder-web
   changed_when: yes
@@ -45,13 +45,13 @@
 - name: checkout requested schleuder-web version
   become: yes
   become_user: schleuder-web
-  command:
+  ansible.builtin.command:
     cmd: git checkout "{{ schleuder_web_commitish }}"  # noqa command-instead-of-module
     chdir: /var/lib/schleuder-web/schleuder-web
   changed_when: yes
 
 - name: render /var/lib/schleuder-web/schleuder-web/config/schleuder-web.yml
-  template:
+  ansible.builtin.template:
     src: var/lib/schleuder-web/schleuder-web/config/schleuder-web.yml.j2
     dest: /var/lib/schleuder-web/schleuder-web/config/schleuder-web.yml
     owner: schleuder-web
@@ -60,7 +60,7 @@
   notify: systemctl restart schleuder-web
 
 - name: render /var/lib/schleuder-web/schleuder-web/config/database.yml
-  template:
+  ansible.builtin.template:
     src: var/lib/schleuder-web/schleuder-web/config/database.yml.j2
     dest: /var/lib/schleuder-web/schleuder-web/config/database.yml
     owner: schleuder-web
@@ -73,7 +73,7 @@
   register: schleuder_register_apicert_info
 
 - name: render /etc/default/schleuder-web
-  template:
+  ansible.builtin.template:
     src: etc/default/schleuder-web.j2
     dest: /etc/default/schleuder-web
     owner: root
@@ -84,7 +84,7 @@
   notify: systemctl restart schleuder-web
 
 - name: render systemd service unit
-  template:
+  ansible.builtin.template:
     src: etc/systemd/system/schleuder-web.service.j2
     dest: /etc/systemd/system/schleuder-web.service
     owner: root
@@ -95,7 +95,7 @@
 - name: run bundle install ... this may take a few minutes
   become: yes
   become_user: schleuder-web
-  command:
+  ansible.builtin.command:
     cmd: /usr/bin/bundle install --path /var/lib/schleuder-web/.gem --without deployment
     chdir: /var/lib/schleuder-web/schleuder-web
   changed_when: yes
@@ -103,7 +103,7 @@
 - name: run bundle db setup
   become: yes
   become_user: schleuder-web
-  command:
+  ansible.builtin.command:
     cmd: /usr/bin/bundle exec rake db:setup
     chdir: /var/lib/schleuder-web/schleuder-web
     creates: /var/lib/schleuder-web/schleuder-web.sqlite3
@@ -111,10 +111,10 @@
     RAILS_ENV: production
 
 - name: flush systemd daemon-reload
-  meta: flush_handlers
+  ansible.builtin.meta: flush_handlers
 
 - name: start and enable schleuder-web
-  service:
+  ansible.builtin.service:
     name: schleuder-web
     state: started
     enabled: true

roles/schleuder/tasks/main.yml

@@ -1,22 +1,22 @@
 ---
 
-- import_tasks: install.yml
+- ansible.builtin.import_tasks: install.yml
   tags:
     - "role::schleuder"
     - "role::schleuder:install"
 
-- import_tasks: config.yml
+- ansible.builtin.import_tasks: config.yml
   tags:
     - "role::schleuder"
     - "role::schleuder:config"
 
-- import_tasks: install_web.yml
+- ansible.builtin.import_tasks: install_web.yml
   when: schleuder_web_install
   tags:
     - "role::schleuder"
     - "role::schleuder:install_web"
 
-- import_tasks: cli_apitokens.yml
+- ansible.builtin.import_tasks: cli_apitokens.yml
   tags:
     - "role::schleuder"
     - "role::schleuder:cli_apitokens"

roles/spamassassin/handlers/main.yml

@@ -1,16 +1,16 @@
 ---
 
 - name: restart spamd
-  service:
+  ansible.builtin.service:
     name: spamassassin
     state: restarted
 
 - name: restart spamass-milter
-  service:
+  ansible.builtin.service:
     name: spamass-milter
     state: restarted
 
 - name: reload spamd
-  service:
+  ansible.builtin.service:
     name: spamassassin
     state: reloaded

roles/spamassassin/tasks/config.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: render /etc/default/spamassassin
-  template:
+  ansible.builtin.template:
     src: etc/default/spamassassin.j2
     dest: /etc/default/spamassassin
     owner: root
@@ -10,7 +10,7 @@
   notify: restart spamd
 
 - name: render /etc/default/spamass-milter
-  template:
+  ansible.builtin.template:
     src: etc/default/spamass-milter.j2
     dest: /etc/default/spamass-milter
     owner: root
@@ -19,7 +19,7 @@
   notify: restart spamass-milter
 
 - name: render /etc/spamassassin/local.cf
-  template:
+  ansible.builtin.template:
     src: etc/spamassassin/local.cf.j2
     dest: /etc/spamassassin/local.cf
     owner: root

roles/spamassassin/tasks/install.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: install spamassassin
-  apt:
+  ansible.builtin.apt:
     name: "{{ item }}"
     state: present
   loop:
@@ -10,19 +10,19 @@
     - spamc
 
 - name: start and enable spamassassin spamd
-  service:
+  ansible.builtin.service:
     name: spamassassin
     state: started
     enabled: yes
 
 - name: start and enable spamass-milter spamd
-  service:
+  ansible.builtin.service:
     name: spamass-milter
     state: started
     enabled: yes
 
 - name: render auto sa-learn script
-  template:
+  ansible.builtin.template:
     src: usr/local/bin/sa-learn.sh.j2
     dest: /usr/local/bin/sa-learn.sh
     owner: root
@@ -30,7 +30,7 @@
     mode: 0755
 
 - name: render auto sa-learn cronjonb
-  template:
+  ansible.builtin.template:
     src: etc/cron.d/sa-learn.j2
     dest: /etc/cron.d/sa-learn
     owner: root

roles/spamassassin/tasks/main.yml

@@ -1,11 +1,11 @@
 ---
 
-- import_tasks: install.yml
+- ansible.builtin.import_tasks: install.yml
   tags:
     - "role::spamassassin"
     - "role::spamassassin:install"
 
-- import_tasks: config.yml
+- ansible.builtin.import_tasks: config.yml
   tags:
     - "role::spamassassin"
     - "role::spamassassin:config"