From 4f8f5f534e15d0df82530ae7e640e7c8c05510da Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Sun, 19 May 2024 14:04:58 +0800 Subject: [PATCH] https://github.com/ansible/ansible-lint/pull/4139 --- .ansible-lint | 2 +- .yamllint | 42 ++++++++++++++---------------------------- roles/ansible | 2 +- roles/cloud_init | 2 +- roles/kernel | 2 +- roles/locales | 2 +- roles/python | 2 +- roles/sshd | 2 +- roles/timezone | 2 +- 9 files changed, 22 insertions(+), 36 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index 9115607..ea09ec5 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,6 +1,6 @@ --- -# Copyright 2023 Wong Hoi Sing Edison +# Copyright 2024 Wong Hoi Sing Edison # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.yamllint b/.yamllint index 271f867..118987c 100644 --- a/.yamllint +++ b/.yamllint @@ -1,6 +1,6 @@ --- -# Copyright 2023 Wong Hoi Sing Edison +# Copyright 2024 Wong Hoi Sing Edison # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,35 +15,21 @@ # limitations under the License. extends: default - rules: braces: max-spaces-inside: 1 - level: error - brackets: - max-spaces-inside: 1 - level: error - colons: - max-spaces-after: -1 - level: error - commas: - max-spaces-after: -1 - level: error - comments: disable - comments-indentation: disable - document-start: disable - empty-lines: - max: 3 - level: error - hyphens: - level: error + min-spaces-inside: 0 + comments: + min-spaces-from-content: 1 + comments-indentation: false + document-start: + present: true indentation: - spaces: 2 - indent-sequences: true - key-duplicates: enable + indent-sequences: consistent + level: error + key-duplicates: + forbid-duplicated-merge-keys: true line-length: disable - new-line-at-end-of-file: disable - new-lines: - type: unix - trailing-spaces: disable - truthy: disable + octal-values: + forbid-explicit-octal: true + forbid-implicit-octal: true diff --git a/roles/ansible b/roles/ansible index 7204cfd..de53659 160000 --- a/roles/ansible +++ b/roles/ansible @@ -1 +1 @@ -Subproject commit 7204cfd8f71667671aeb215882d2c475a42bb70c +Subproject commit de53659e764c8137ad8c2af3e7204a8c1a039ff3 diff --git a/roles/cloud_init b/roles/cloud_init index 4f3c438..28fa4dd 160000 --- a/roles/cloud_init +++ b/roles/cloud_init @@ -1 +1 @@ -Subproject commit 4f3c43897d2703c969976aca92af7712bd41b848 +Subproject commit 28fa4dd18b9d42b0c5f7555c0b025daea6d56dd8 diff --git a/roles/kernel b/roles/kernel index 9e650c5..38f464d 160000 --- a/roles/kernel +++ b/roles/kernel @@ -1 +1 @@ -Subproject commit 9e650c5af4f3e84ce9c852f39bd965f52f328b85 +Subproject commit 38f464dc2a9086e1fa8acdbb32f00d0a17aa1952 diff --git a/roles/locales b/roles/locales index 6dfee0f..a508270 160000 --- a/roles/locales +++ b/roles/locales @@ -1 +1 @@ -Subproject commit 6dfee0f53e0cc222bc4a8892c87786803a2c1622 +Subproject commit a50827005ef6b9259b15d1ab57c1d18dd97983fc diff --git a/roles/python b/roles/python index 60d7db5..8e6446d 160000 --- a/roles/python +++ b/roles/python @@ -1 +1 @@ -Subproject commit 60d7db58ec5050c820cc10999c74a0daeb5e5ef9 +Subproject commit 8e6446d3625e5a064da6ebc45e877ffa7e90b9b1 diff --git a/roles/sshd b/roles/sshd index a4bf85c..f469ee6 160000 --- a/roles/sshd +++ b/roles/sshd @@ -1 +1 @@ -Subproject commit a4bf85c24a0b12c14879c3c4494cab94b38f9762 +Subproject commit f469ee6cc305b6a1377d4dd56053e7ebc539cae1 diff --git a/roles/timezone b/roles/timezone index 8489e9f..60bbab1 160000 --- a/roles/timezone +++ b/roles/timezone @@ -1 +1 @@ -Subproject commit 8489e9f5a0e6bdc58426b7dba4a9c0ea8ea52ffd +Subproject commit 60bbab11fa6ffd3932ee865f6f595916f9e43d7b