From fa6ed6484e246db5eebb26003f10b2a4578b222f Mon Sep 17 00:00:00 2001 From: VC Date: Fri, 5 Jul 2024 11:53:33 +0200 Subject: [PATCH] style: make ansible-lint happier --- roles/garage/handlers/main.yml | 4 ++-- roles/garage/tasks/main.yml | 18 ++++++++++-------- roles/haproxy/handlers/main.yml | 4 ++-- roles/haproxy/tasks/main.yml | 11 ++++++----- roles/icecast2/handlers/main.yml | 4 ++-- roles/icecast2/tasks/main.yml | 11 ++++++----- roles/mailman/handlers/main.yml | 4 ++-- roles/mailman/tasks/main.yml | 15 ++++++++------- 8 files changed, 38 insertions(+), 33 deletions(-) diff --git a/roles/garage/handlers/main.yml b/roles/garage/handlers/main.yml index 624a75f..a9f78c1 100644 --- a/roles/garage/handlers/main.yml +++ b/roles/garage/handlers/main.yml @@ -1,7 +1,7 @@ --- -- name: restart garage - systemd: +- name: Restart garage + ansible.builtin.systemd: name: garage enabled: true daemon_reload: true diff --git a/roles/garage/tasks/main.yml b/roles/garage/tasks/main.yml index 5256b2a..52f9a2f 100644 --- a/roles/garage/tasks/main.yml +++ b/roles/garage/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: install garage - get_url: +- name: Install garage + ansible.builtin.get_url: url: "{{ garage_url }}" dest: "{{ garage_bin }}" owner: root @@ -9,20 +9,22 @@ mode: 0755 force: true notify: - - restart garage + - Restart garage -- name: install garage systemd file - template: +- name: Install garage systemd file + ansible.builtin.template: src: garage.service.j2 dest: /etc/systemd/system/garage.service + mode: 0644 -- name: put garage.toml conf file - template: +- name: Put garage.toml conf file + ansible.builtin.template: src: garage.toml.j2 dest: /etc/garage.toml + mode: 0644 vars: cluster_group: "{{ group_names | map('regex_search', '.+_cluster') | select('string') | first }}" cluster_group_length: "{{ groups[cluster_group] | reject('search', 'gw') | length }}" garage_replication_mode: "{{ cluster_group_length | int if (cluster_group_length | int) <= 3 else 3 }}" notify: - - restart garage + - Restart garage diff --git a/roles/haproxy/handlers/main.yml b/roles/haproxy/handlers/main.yml index 0c5c107..07a1b31 100644 --- a/roles/haproxy/handlers/main.yml +++ b/roles/haproxy/handlers/main.yml @@ -1,6 +1,6 @@ --- -- name: restart haproxy - service: +- name: Restart haproxy + ansible.builtin.service: name: haproxy state: restarted diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml index 9bec241..0607f85 100644 --- a/roles/haproxy/tasks/main.yml +++ b/roles/haproxy/tasks/main.yml @@ -1,13 +1,14 @@ --- -- name: install haproxy package - package: +- name: Install haproxy package + ansible.builtin.package: name: haproxy state: present -- name: haproxy config - template: +- name: Haproxy config + ansible.builtin.template: src: haproxy.cfg.j2 dest: /etc/haproxy/haproxy.cfg + mode: 0644 notify: - - restart haproxy + - Restart haproxy diff --git a/roles/icecast2/handlers/main.yml b/roles/icecast2/handlers/main.yml index d4695da..956901d 100644 --- a/roles/icecast2/handlers/main.yml +++ b/roles/icecast2/handlers/main.yml @@ -1,6 +1,6 @@ --- -- name: restart icecast2 - service: +- name: Restart icecast2 + ansible.builtin.service: name: icecast2 state: restarted diff --git a/roles/icecast2/tasks/main.yml b/roles/icecast2/tasks/main.yml index 10aeabd..371b2ae 100644 --- a/roles/icecast2/tasks/main.yml +++ b/roles/icecast2/tasks/main.yml @@ -1,13 +1,14 @@ --- -- name: install icecast2 - package: +- name: Install icecast2 + ansible.builtin.package: name: icecast2 state: present -- name: configuration file - template: +- name: Configuration file + ansible.builtin.template: src: icecast.xml.j2 dest: /etc/icecast2/icecast.xml + mode: 0644 notify: - - restart icecast2 + - Restart icecast2 diff --git a/roles/mailman/handlers/main.yml b/roles/mailman/handlers/main.yml index 0c68eb7..5f972bf 100644 --- a/roles/mailman/handlers/main.yml +++ b/roles/mailman/handlers/main.yml @@ -1,6 +1,6 @@ --- -- name: restart mailman3 - service: +- name: Restart mailman3 + ansible.builtin.service: name: mailman3 state: restarted diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml index 94eb11f..4cbe733 100644 --- a/roles/mailman/tasks/main.yml +++ b/roles/mailman/tasks/main.yml @@ -1,21 +1,22 @@ --- -- name: install mailman3 and dependencies - package: +- name: Install mailman3 and dependencies + ansible.builtin.package: name: "{{ item }}" state: present loop: - mailman3-full - sqlite3 -- name: put mailman3 config file - copy: +- name: Put mailman3 config file + ansible.builtin.copy: src: ./files/mailman.cfg dest: /etc/mailman3/mailman.cfg - notify: restart mailman3 + mode: 0644 + notify: Restart mailman3 -- name: start mailman3 service - service: +- name: Start mailman3 service + ansible.builtin.service: name: mailman3 state: started enabled: true