From 7c1042f7b8eb56c5504b21306d042b04c70fa8fb Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 18 Aug 2024 16:05:11 +0200 Subject: [PATCH] refactor: switch to ansible-lint and ansible-dev-tools container --- .later.yml | 15 --------------- .woodpecker/lint.yaml | 6 +++--- .woodpecker/test.yaml | 2 +- .yamllint | 20 ++++++++++++++++++++ handlers/main.yml | 4 ++-- 5 files changed, 26 insertions(+), 21 deletions(-) delete mode 100644 .later.yml create mode 100644 .yamllint diff --git a/.later.yml b/.later.yml deleted file mode 100644 index 2703cb9..0000000 --- a/.later.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -ansible: - custom_modules: - - iptables_raw - - openssl_pkcs12 - - proxmox_kvm - - ucr - - corenetworks_dns - - corenetworks_token - -rules: - exclude_files: - - "LICENSE*" - - "**/*.md" - - "**/*.ini" diff --git a/.woodpecker/lint.yaml b/.woodpecker/lint.yaml index 36b1ec8..59b112b 100644 --- a/.woodpecker/lint.yaml +++ b/.woodpecker/lint.yaml @@ -6,10 +6,10 @@ when: - ${CI_REPO_DEFAULT_BRANCH} steps: - - name: ansible-later - image: quay.io/thegeeklab/ansible-later:4 + - name: ansible-lint + image: ghcr.io/ansible/community-ansible-dev-tools commands: - - ansible-later + - ansible-lint environment: FORCE_COLOR: "1" diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml index 256ad91..d332edc 100644 --- a/.woodpecker/test.yaml +++ b/.woodpecker/test.yaml @@ -7,7 +7,7 @@ when: variables: - &molecule_base - image: quay.io/thegeeklab/molecule:6 + image: ghcr.io/ansible/community-ansible-dev-tools group: molecule environment: PY_COLORS: "1" diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..df1d39e --- /dev/null +++ b/.yamllint @@ -0,0 +1,20 @@ +--- +extends: default + +rules: + truthy: + allowed-values: ["True", "False"] + comments: + min-spaces-from-content: 1 + comments-indentation: False + line-length: disable + braces: + min-spaces-inside: 0 + max-spaces-inside: 1 + brackets: + min-spaces-inside: 0 + max-spaces-inside: 0 + indentation: enable + octal-values: + forbid-implicit-octal: True + forbid-explicit-octal: True diff --git a/handlers/main.yml b/handlers/main.yml index fccb13f..ee46eee 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -2,8 +2,8 @@ - name: Restart auditd ansible.builtin.service: name: auditd - daemon_reload: yes - enabled: yes + daemon_reload: True + enabled: True state: started when: not auditd_refuse_manual_stop | bool listen: __auditd_restart