From a4e756a1fc1ecb968dd6aa7721a85f33a7c6f969 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Sat, 29 Oct 2022 17:55:27 +0000
Subject: [PATCH] dovecot: ansible-lint fixes

---
 roles/dovecot/handlers/main.yml |  3 +--
 roles/dovecot/tasks/main.yml    | 47 ++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/roles/dovecot/handlers/main.yml b/roles/dovecot/handlers/main.yml
index e0aff58..8f8b702 100644
--- a/roles/dovecot/handlers/main.yml
+++ b/roles/dovecot/handlers/main.yml
@@ -1,6 +1,5 @@
 ---
-
-- name: restart dovecot
+- name: Restart dovecot
   service:
     name: dovecot
     state: restarted
diff --git a/roles/dovecot/tasks/main.yml b/roles/dovecot/tasks/main.yml
index 51de185..be283fa 100644
--- a/roles/dovecot/tasks/main.yml
+++ b/roles/dovecot/tasks/main.yml
@@ -1,12 +1,11 @@
 ---
-
-- name: install packages
-  package:
+- name: Install packages
+  ansible.builtin.package:
     name: dovecot
     state: installed
 
-- name: create kerberoskeytab
-  include_role:
+- name: Create kerberos keytab
+  ansible.builtin.include_role:
     name: keytab
   vars:
     keytab: /etc/dovecot/dovecot.keytab
@@ -14,8 +13,8 @@
       - "imap/{{ mail_server }}@{{ kerberos_realm }}"
     group: dovecot
 
-- name: install privatekey
-  copy:
+- name: Install privatekey
+  ansible.builtin.copy:
     dest: "{{ tls_private }}/{{ mail_server }}.key"
     src: "{{ item }}"
     mode: 0600
@@ -25,10 +24,10 @@
     - "/srv/letsencrypt/live/{{ mail_server }}/privkey.pem"
     - "/srv/ca/private/{{ inventory_hostname }}.key"
   tags: certificates
-  notify: restart dovecot
+  notify: Restart dovecot
 
-- name: install certificate
-  copy:
+- name: Install certificate
+  ansible.builtin.copy:
     dest: "{{ tls_certs }}/{{ mail_server }}-fullchain.crt"
     src: "{{ item }}"
     mode: 0644
@@ -38,25 +37,25 @@
     - "/srv/letsencrypt/live/{{ mail_server }}/fullchain.pem"
     - "/srv/ca/certs/hosts/{{ inventory_hostname }}.crt"
   tags: certificates
-  notify: restart dovecot
+  notify: Restart dovecot
 
-- name: create local config
-  template:
+- name: Create local config
+  ansible.builtin.template:
     dest: /etc/dovecot/conf.d/99-local.conf
     src: local.conf.j2
     mode: 0644
     owner: root
     group: "{{ ansible_wheel }}"
     validate: doveconf -n %s
-  notify: restart dovecot
+  notify: Restart dovecot
 
-- name: fix selinux contexts from cache directory
-  sefcontext:
+- name: Fix SELinux contexts from cache directory
+  community.general.sefcontext:
     path: "/var/spool/dovecot/index/home(/.*)?"
     setype: user_home_t
 
-- name: create cache directory hierarcy
-  file:
+- name: Create cache directory hierarcy
+  ansible.builtin.file:
     path: "{{ item }}"
     state: directory
     mode: 0755
@@ -67,24 +66,24 @@
     - /var/spool/dovecot
     - /var/spool/dovecot/index
 
-- name: create user cache directory
-  file:
+- name: Create user cache directory
+  ansible.builtin.file:
     path: /var/spool/dovecot/index/home
     state: directory
     owner: root
     group: "{{ ansible_wheel }}"
     setype: _default
 
-- name: create tmpfs mount for cache
-  mount:
+- name: Create tmpfs mount for cache
+  ansible.posix.mount:
     state: mounted
     path: /var/spool/dovecot/index/home
     src: none
     fstype: tmpfs
     opts: mode=1777,context="system_u:object_r:user_home_t:s0"
 
-- name: enable service
-  service:
+- name: Enable service
+  ansible.builtin.service:
     name: dovecot
     enabled: true
     state: started