From 332dc0f60a53ee047708ed00582d11c33d2db64f Mon Sep 17 00:00:00 2001
From: VC <veretcle+framagit@mateu.be>
Date: Fri, 5 Jul 2024 11:53:33 +0200
Subject: [PATCH] style: make ansible-lint happier

---
 roles/docker/tasks/main.yml      | 17 +++++++++--------
 roles/dovecot/handlers/main.yml  | 10 ++++++----
 roles/dovecot/tasks/main.yml     | 20 +++++++++++---------
 roles/firewall/handlers/main.yml |  4 ++--
 roles/firewall/tasks/main.yml    |  7 ++++---
 roles/ftp/handlers/main.yml      |  4 ++--
 roles/ftp/tasks/main.yml         | 17 ++++++++++-------
 7 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index e9a3434..4fefade 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,17 +1,17 @@
 ---
 
-- name: docker repo key
-  apt_key:
+- name: Docker repo key
+  ansible.builtin.apt_key:
     url: https://download.docker.com/linux/debian/gpg
     state: present
 
-- name: docker repo install
-  apt_repository:
+- name: Docker repo install
+  ansible.builtin.apt_repository:
     repo: "deb [arch=amd64] https://download.docker.com/linux/debian {{ ansible_facts['distribution_release'] }} stable"
     state: present
 
-- name: install docker, docker-compose and extra packages
-  package:
+- name: Install docker, docker-compose and extra packages
+  ansible.builtin.package:
     name: "{{ item }}"
     state: present
   loop:
@@ -21,9 +21,10 @@
     - docker-compose
     - fuse-overlayfs
 
-- name: docker directory
-  file:
+- name: Docker directory
+  ansible.builtin.file:
     path: /srv/docker
     owner: root
     group: root
     state: directory
+    mode: 0755
diff --git a/roles/dovecot/handlers/main.yml b/roles/dovecot/handlers/main.yml
index 0490de1..2f17068 100644
--- a/roles/dovecot/handlers/main.yml
+++ b/roles/dovecot/handlers/main.yml
@@ -1,9 +1,11 @@
 ---
 
-- name: restart dovecot
-  service:
+- name: Restart dovecot
+  ansible.builtin.service:
     name: dovecot
     state: restarted
 
-- name: compile sieve
-  command: sievec /etc/dovecot/before.sieve
+- name: Compile sieve
+  ansible.builtin.command:
+    cmd: sievec /etc/dovecot/before.sieve
+  changed_when: true
diff --git a/roles/dovecot/tasks/main.yml b/roles/dovecot/tasks/main.yml
index 7c6e3db..d79953a 100644
--- a/roles/dovecot/tasks/main.yml
+++ b/roles/dovecot/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
-- name: install dovecot
-  package:
+- name: Install dovecot
+  ansible.builtin.package:
     name: "{{ item }}"
     state: present
   loop:
@@ -8,17 +8,19 @@
     - dovecot-sieve
     - dovecot-lmtpd
 
-- name: main configuration file
-  copy:
+- name: Main configuration file
+  ansible.builtin.copy:
     src: ./files/dovecot.conf
     dest: /etc/dovecot/dovecot.conf
+    mode: 0644
   notify:
-    - restart dovecot
+    - Restart dovecot
 
-- name: sieve configuration file
-  copy:
+- name: Sieve configuration file
+  ansible.builtin.copy:
     src: ./files/before.sieve
     dest: /etc/dovecot/before.sieve
+    mode: 0644
   notify:
-    - compile sieve
-    - restart dovecot
+    - Compile sieve
+    - Restart dovecot
diff --git a/roles/firewall/handlers/main.yml b/roles/firewall/handlers/main.yml
index 7570752..ad40bcf 100644
--- a/roles/firewall/handlers/main.yml
+++ b/roles/firewall/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: reload firewall
-  openwrt_init:
+- name: Reload firewall
+  community.general.openwrt_init:
     name: firewall
     state: reloaded
diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml
index 7d40829..16d36be 100644
--- a/roles/firewall/tasks/main.yml
+++ b/roles/firewall/tasks/main.yml
@@ -1,7 +1,8 @@
 ---
 
-- name: generate firewall file
-  template:
+- name: Generate firewall file
+  ansible.builtin.template:
     src: firewall.j2
     dest: /etc/config/firewall
-  notify: reload firewall
+    mode: 0644
+  notify: Reload firewall
diff --git a/roles/ftp/handlers/main.yml b/roles/ftp/handlers/main.yml
index fa8869c..7728987 100644
--- a/roles/ftp/handlers/main.yml
+++ b/roles/ftp/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: restart vsftpd
-  service:
+- name: Restart vsftpd
+  ansible.builtin.service:
     name: vsftpd
     state: restarted
diff --git a/roles/ftp/tasks/main.yml b/roles/ftp/tasks/main.yml
index eae8d5f..9fcfe32 100644
--- a/roles/ftp/tasks/main.yml
+++ b/roles/ftp/tasks/main.yml
@@ -1,32 +1,35 @@
 ---
 
 - name: Install vsftpd
-  package:
+  ansible.builtin.package:
     name: vsftpd
     state: present
 
 - name: Create ftp directory
-  file:
+  ansible.builtin.file:
     path: /srv/ftp
     state: directory
+    mode: 0755
 
 - name: Create upload directory
-  file:
+  ansible.builtin.file:
     path: /srv/ftp/upload
     owner: ftp
     group: root
     state: directory
+    mode: 0755
 
 - name: Config vsftpd
-  copy:
+  ansible.builtin.copy:
     src: files/vsftpd.conf
     dest: /etc/vsftpd.conf
     owner: root
     group: root
-  notify: restart vsftpd
+    mode: 0755
+  notify: Restart vsftpd
 
 - name: Put control size script
-  copy:
+  ansible.builtin.copy:
     src: files/deleteoldfiles.sh
     dest: /usr/local/sbin/deleteoldfiles.sh
     owner: root
@@ -34,7 +37,7 @@
     mode: '0700'
 
 - name: Cron control size script
-  cron:
+  ansible.builtin.cron:
     name: Delete oldest file
     user: root
     minute: '0'