From 26d5319dc85634012cbadad4bbd840ea88c3e0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorben=20G=C3=BCnther?= Date: Sat, 21 May 2022 02:13:13 +0200 Subject: [PATCH] Make ansible-lint happy --- .ansible-lint | 4 ---- .yamllint | 3 --- .yamllint.yml | 4 ++++ molecule/default/prepare.yml | 4 ++-- molecule/default/verify.yml | 2 +- playbooks/avalon.yml | 2 +- roles/ejabberd/tasks/main.yml | 3 +++ roles/install_archlinux/tasks/main.yml | 3 +++ roles/upgrade/tasks/Archlinux.yml | 2 +- roles/{uptime-kuma => uptime_kuma}/files/docker-compose.yml | 0 roles/{uptime-kuma => uptime_kuma}/files/uptimekuma.conf | 0 roles/{uptime-kuma => uptime_kuma}/tasks/main.yml | 0 12 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 .yamllint create mode 100644 .yamllint.yml rename roles/{uptime-kuma => uptime_kuma}/files/docker-compose.yml (100%) rename roles/{uptime-kuma => uptime_kuma}/files/uptimekuma.conf (100%) rename roles/{uptime-kuma => uptime_kuma}/tasks/main.yml (100%) diff --git a/.ansible-lint b/.ansible-lint index a07742a..6f1b2a8 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,7 +1,3 @@ -exclude_paths: - - misc skip_list: - - braces - - line-length - no-handler - meta-no-info diff --git a/.yamllint b/.yamllint deleted file mode 100644 index 56684ed..0000000 --- a/.yamllint +++ /dev/null @@ -1,3 +0,0 @@ -rules: - comments: - min-spaces-from-content: 1 diff --git a/.yamllint.yml b/.yamllint.yml new file mode 100644 index 0000000..407935d --- /dev/null +++ b/.yamllint.yml @@ -0,0 +1,4 @@ +--- +rules: + line-length: + max: 220 diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index cd57fc0..32816fb 100644 --- a/molecule/default/prepare.yml +++ b/molecule/default/prepare.yml @@ -16,8 +16,8 @@ - name: Setup Arch Linux keyring block: - - name: Init keyring + - name: Init keyring # noqa no-changed-when ansible.builtin.command: pacman-key --init - - name: Populate keyring + - name: Populate keyring # noqa no-changed-when ansible.builtin.command: pacman-key --populate archlinux diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 23740d6..70761cd 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -4,5 +4,5 @@ gather_facts: false tasks: - name: Example assertion - assert: + ansible.builtin.assert: that: true diff --git a/playbooks/avalon.yml b/playbooks/avalon.yml index 93e4ede..dc2abc5 100644 --- a/playbooks/avalon.yml +++ b/playbooks/avalon.yml @@ -45,7 +45,7 @@ - { role: syncthing } - { role: wireguard } - { role: wireguard_vpn_server } - - { role: uptime-kuma } + - { role: uptime_kuma } - { role: gotify_server } - { role: gotify_app } - { role: matrix } diff --git a/roles/ejabberd/tasks/main.yml b/roles/ejabberd/tasks/main.yml index a78dcb8..0263e79 100644 --- a/roles/ejabberd/tasks/main.yml +++ b/roles/ejabberd/tasks/main.yml @@ -31,6 +31,9 @@ ansible.builtin.get_url: url: https://raw.githubusercontent.com/processone/ejabberd/master/sql/pg.sql dest: /tmp/pg.sql + owner: root + group: root + mode: 0644 when: ejabberd_db.changed - name: import db schema diff --git a/roles/install_archlinux/tasks/main.yml b/roles/install_archlinux/tasks/main.yml index 72e047c..882da3c 100644 --- a/roles/install_archlinux/tasks/main.yml +++ b/roles/install_archlinux/tasks/main.yml @@ -39,6 +39,9 @@ # TODO: Put version in variable url: https://ftp.gwdg.de/pub/linux/archlinux/iso/2021.06.01/archlinux-bootstrap-2021.06.01-x86_64.tar.gz dest: /tmp/ + owner: root + group: root + mode: 0644 - name: Extract bootstap image ansible.builtin.unarchive: diff --git a/roles/upgrade/tasks/Archlinux.yml b/roles/upgrade/tasks/Archlinux.yml index 24db02e..c2969be 100644 --- a/roles/upgrade/tasks/Archlinux.yml +++ b/roles/upgrade/tasks/Archlinux.yml @@ -6,4 +6,4 @@ register: upgrade_archlinux - name: list archlinux upgrades - debug: var=upgrade_archlinux.packages + ansible.builtin.debug: var=upgrade_archlinux.packages diff --git a/roles/uptime-kuma/files/docker-compose.yml b/roles/uptime_kuma/files/docker-compose.yml similarity index 100% rename from roles/uptime-kuma/files/docker-compose.yml rename to roles/uptime_kuma/files/docker-compose.yml diff --git a/roles/uptime-kuma/files/uptimekuma.conf b/roles/uptime_kuma/files/uptimekuma.conf similarity index 100% rename from roles/uptime-kuma/files/uptimekuma.conf rename to roles/uptime_kuma/files/uptimekuma.conf diff --git a/roles/uptime-kuma/tasks/main.yml b/roles/uptime_kuma/tasks/main.yml similarity index 100% rename from roles/uptime-kuma/tasks/main.yml rename to roles/uptime_kuma/tasks/main.yml -- 2.44.0