From a0eafea5ffea45f7051237309d14f9125168cb66 Mon Sep 17 00:00:00 2001 From: VC Date: Fri, 5 Jul 2024 11:53:32 +0200 Subject: [PATCH] style: make ansible-lint happier --- roles/webapps/handlers/main.yml | 8 ++++---- roles/webapps/tasks/main.yml | 22 +++++++++++----------- roles/webapps/tasks/matomo.yml | 4 ++-- roles/webapps/tasks/scootaloo.yml | 21 +++++++++++---------- roles/webapps/tasks/scootaloo_config.yml | 4 ++-- roles/webapps/tasks/tootctl_docker.yml | 8 ++++---- roles/webapps/tasks/tootctl_nodocker.yml | 8 ++++---- roles/webapps/tasks/ttrss.yml | 13 +++++++------ roles/webapps/tasks/wp_dojo.yml | 9 +++++---- 9 files changed, 50 insertions(+), 47 deletions(-) diff --git a/roles/webapps/handlers/main.yml b/roles/webapps/handlers/main.yml index de64657..bb3f683 100644 --- a/roles/webapps/handlers/main.yml +++ b/roles/webapps/handlers/main.yml @@ -1,11 +1,11 @@ --- -- name: restart nginx - service: +- name: Restart nginx + ansible.builtin.service: name: nginx state: restarted -- name: restart php-fpm - service: +- name: Restart php-fpm + ansible.builtin.service: name: "php{{ php_version }}-fpm" state: restarted diff --git a/roles/webapps/tasks/main.yml b/roles/webapps/tasks/main.yml index aa41864..501b47e 100644 --- a/roles/webapps/tasks/main.yml +++ b/roles/webapps/tasks/main.yml @@ -1,25 +1,25 @@ --- -- name: include ttrss for web1 - include_tasks: ttrss.yml +- name: Include ttrss for web1 + ansible.builtin.include_tasks: ttrss.yml when: inventory_hostname == 'web1.dmz.mateu.be' -- name: include matomo for web2 - include_tasks: matomo.yml +- name: Include matomo for web2 + ansible.builtin.include_tasks: matomo.yml when: inventory_hostname == 'web2.dmz.mateu.be' - name: WP for NintendojoFR - include_tasks: wp_dojo.yml + ansible.builtin.include_tasks: wp_dojo.yml when: inventory_hostname == 'web2.dmz.mateu.be' # Scootaloo - name: Scootaloo config for m.nintendojo.fr - include_tasks: scootaloo_config.yml + ansible.builtin.include_tasks: scootaloo_config.yml when: inventory_hostname == 'masto1.dmz.mateu.be' - name: Scootaloo for Mastodon - include_tasks: scootaloo.yml + ansible.builtin.include_tasks: scootaloo.yml when: inventory_hostname in groups['rorservers'] -- name: tootctl (docker) for mastodon - include_tasks: tootctl_docker.yml +- name: Tootctl (docker) for mastodon + ansible.builtin.include_tasks: tootctl_docker.yml when: inventory_hostname in groups['dockerservers'] -- name: tootctl (no docker) for mastodon - include_tasks: tootctl_nodocker.yml +- name: Tootctl (no docker) for mastodon + ansible.builtin.include_tasks: tootctl_nodocker.yml when: inventory_hostname in groups['mastodonservers'] diff --git a/roles/webapps/tasks/matomo.yml b/roles/webapps/tasks/matomo.yml index db62db3..58c4a12 100644 --- a/roles/webapps/tasks/matomo.yml +++ b/roles/webapps/tasks/matomo.yml @@ -1,7 +1,7 @@ --- -- name: crontab for matomo - cron: +- name: Crontab for matomo + ansible.builtin.cron: name: Matomo reports user: www-data minute: "5" diff --git a/roles/webapps/tasks/scootaloo.yml b/roles/webapps/tasks/scootaloo.yml index 6589378..5d63e13 100644 --- a/roles/webapps/tasks/scootaloo.yml +++ b/roles/webapps/tasks/scootaloo.yml @@ -1,36 +1,37 @@ --- -- name: install scootaloo - get_url: +- name: Install scootaloo + ansible.builtin.get_url: url: "https://r.mateu.be/scootaloo/scootaloo.v{{ scootaloo_version }}" dest: "{{ scootaloo_bin_path }}" owner: root group: www-data mode: 0750 -- name: create scootaloo config dir - file: +- name: Create scootaloo config dir + ansible.builtin.file: path: "{{ scootaloo_db_path }}" state: directory owner: www-data group: www-data mode: 0750 -- name: init scootaloo db - shell: +- name: Init scootaloo db + ansible.builtin.command: cmd: "{{ scootaloo_bin_path }} init" creates: "{{ scootaloo_db_path }}/scootaloo.sqlite" become: true become_user: www-data -- name: migrate scootaloo db - shell: +- name: Migrate scootaloo db + ansible.builtin.command: cmd: "{{ scootaloo_bin_path }} migrate" + changed_when: false become: true become_user: www-data -- name: cron for scootaloo - cron: +- name: Cron for scootaloo + ansible.builtin.cron: name: Scootaloo Dojo user: www-data minute: "*/{{ scootaloo_min_refresh_interval }}" diff --git a/roles/webapps/tasks/scootaloo_config.yml b/roles/webapps/tasks/scootaloo_config.yml index 7fdb87d..21d3e85 100644 --- a/roles/webapps/tasks/scootaloo_config.yml +++ b/roles/webapps/tasks/scootaloo_config.yml @@ -1,7 +1,7 @@ --- -- name: put configuration file - template: +- name: Put configuration file + ansible.builtin.template: src: scootaloo.toml.j2 dest: /usr/local/etc/scootaloo.toml owner: root diff --git a/roles/webapps/tasks/tootctl_docker.yml b/roles/webapps/tasks/tootctl_docker.yml index fa02ced..a41cc3a 100644 --- a/roles/webapps/tasks/tootctl_docker.yml +++ b/roles/webapps/tasks/tootctl_docker.yml @@ -1,14 +1,14 @@ --- -- name: cron for media tootctl - cron: +- name: Cron for media tootctl + ansible.builtin.cron: name: Mastodon tootctl minute: "0" hour: "2" job: "docker-compose -f /srv/docker/{{ web_hostname[0] }}/docker-compose.yml run --rm web bin/tootctl media remove" -- name: cron for preview_cards tootctl - cron: +- name: Cron for preview_cards tootctl + ansible.builtin.cron: name: Mastodon tootctl preview minute: "30" hour: "2" diff --git a/roles/webapps/tasks/tootctl_nodocker.yml b/roles/webapps/tasks/tootctl_nodocker.yml index 2c093d1..44b9b1c 100644 --- a/roles/webapps/tasks/tootctl_nodocker.yml +++ b/roles/webapps/tasks/tootctl_nodocker.yml @@ -1,15 +1,15 @@ --- -- name: cron for media tootctl - cron: +- name: Cron for media tootctl + ansible.builtin.cron: user: mastodon name: Mastodon tootctl minute: "0" hour: "2" job: "{{ mastodon_home }}/bin/remove_media.sh" -- name: cron for preview_cards tootctl - cron: +- name: Cron for preview_cards tootctl + ansible.builtin.cron: user: mastodon name: Mastodon tootctl preview minute: "30" diff --git a/roles/webapps/tasks/ttrss.yml b/roles/webapps/tasks/ttrss.yml index 293e0c5..d4d2886 100644 --- a/roles/webapps/tasks/ttrss.yml +++ b/roles/webapps/tasks/ttrss.yml @@ -1,17 +1,18 @@ --- -- name: systemd file for backend - copy: +- name: Systemd file for backend + ansible.builtin.copy: src: files/ttrss_backend.service dest: /etc/systemd/system/ttrss_backend.service + mode: 0644 -- name: enable and start service ttrss_backend - service: +- name: Enable and start service ttrss_backend + ansible.builtin.service: name: ttrss_backend enabled: true state: started -- name: install git - package: +- name: Install git + ansible.builtin.package: name: git state: present diff --git a/roles/webapps/tasks/wp_dojo.yml b/roles/webapps/tasks/wp_dojo.yml index 8a05c0f..16ccefa 100644 --- a/roles/webapps/tasks/wp_dojo.yml +++ b/roles/webapps/tasks/wp_dojo.yml @@ -1,14 +1,15 @@ --- -- name: nginx cache - copy: +- name: Nginx cache + ansible.builtin.copy: src: files/fastcgi_cache.conf dest: /etc/nginx/conf.d/fastcgi_cache.conf + mode: 0644 notify: - restart nginx -- name: wordpress cron - cron: +- name: Wordpress cron + ansible.builtin.cron: name: "WP Twitter refresh" user: www-data minute: "*/2"