From ac4b19ed7f25a5c49a4811b68d70bcb62547c904 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/bootstrap | 2 +- roles/buildah | 2 +- roles/cloud_init | 2 +- roles/conmon | 2 +- roles/containernetworking_plugins | 2 +- roles/containers_common | 2 +- roles/crun | 2 +- roles/cvs | 2 +- roles/git | 2 +- roles/gitlab_runner | 2 +- roles/httpd | 2 +- roles/kernel | 2 +- roles/libvirt | 2 +- roles/locales | 2 +- roles/mariadb | 2 +- roles/mercurial | 2 +- roles/molecule | 2 +- roles/node | 2 +- roles/openjdk | 2 +- roles/packer | 2 +- roles/perforce | 2 +- roles/php | 2 +- roles/podman | 2 +- roles/postgres | 2 +- roles/python | 2 +- roles/rclone | 2 +- roles/restic | 2 +- roles/skopeo | 2 +- roles/sqlite | 2 +- roles/sshd | 2 +- roles/svn | 2 +- roles/timezone | 2 +- roles/vagrant | 2 +- roles/vim | 2 +- roles/virtualbox | 2 +- 38 files changed, 51 insertions(+), 65 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/bootstrap b/roles/bootstrap index 1ac604d..2102776 160000 --- a/roles/bootstrap +++ b/roles/bootstrap @@ -1 +1 @@ -Subproject commit 1ac604d48af2ba27ca7ec409a8d053b907fbd3a6 +Subproject commit 210277690201ec9fd2c9316a82be4cd16b33be8a diff --git a/roles/buildah b/roles/buildah index ea57914..5abb20c 160000 --- a/roles/buildah +++ b/roles/buildah @@ -1 +1 @@ -Subproject commit ea57914a7975902ebbc6838afb0c89b4f93c4b88 +Subproject commit 5abb20c95a12270f9f772db72f89db1ab89c3027 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/conmon b/roles/conmon index 541dd0c..e77b0c8 160000 --- a/roles/conmon +++ b/roles/conmon @@ -1 +1 @@ -Subproject commit 541dd0c6a9486bdd0081701755586ec3036cff0a +Subproject commit e77b0c83242901b994e88455b848bd9844222c80 diff --git a/roles/containernetworking_plugins b/roles/containernetworking_plugins index f8ac10b..bd7e676 160000 --- a/roles/containernetworking_plugins +++ b/roles/containernetworking_plugins @@ -1 +1 @@ -Subproject commit f8ac10b02112916c01b1050fbf67b45f59df96a6 +Subproject commit bd7e67619703a23f70ddbc454c22b8a86f199c4b diff --git a/roles/containers_common b/roles/containers_common index aad85f4..baad4e7 160000 --- a/roles/containers_common +++ b/roles/containers_common @@ -1 +1 @@ -Subproject commit aad85f4197bc21e7b8648211e2ba51312eaed4e9 +Subproject commit baad4e705c01c4e0b82875b144e778937fd3645c diff --git a/roles/crun b/roles/crun index e18daf1..0ffa6cf 160000 --- a/roles/crun +++ b/roles/crun @@ -1 +1 @@ -Subproject commit e18daf1424e810006266a561c6c4b030a6a24493 +Subproject commit 0ffa6cf27102d7789e1c8ebd59f8b966e6dd6494 diff --git a/roles/cvs b/roles/cvs index 4cd438b..5d8a9bf 160000 --- a/roles/cvs +++ b/roles/cvs @@ -1 +1 @@ -Subproject commit 4cd438b04efe00d2063921fdb840065c0adbe1f3 +Subproject commit 5d8a9bf296da427d3e6a738760322a8be33eebca diff --git a/roles/git b/roles/git index f700012..87a53f2 160000 --- a/roles/git +++ b/roles/git @@ -1 +1 @@ -Subproject commit f7000128cabb56e2006ff123694bd857347da7ad +Subproject commit 87a53f200a8a0a9238ecd35bddf50718a1fba5a4 diff --git a/roles/gitlab_runner b/roles/gitlab_runner index a7b8ce7..9638439 160000 --- a/roles/gitlab_runner +++ b/roles/gitlab_runner @@ -1 +1 @@ -Subproject commit a7b8ce70ff0aa56bcecb3b2b00e26349ad15ed88 +Subproject commit 9638439f682ab9cc47d78507f2ffd370715a5903 diff --git a/roles/httpd b/roles/httpd index 9f0c4b9..2640c87 160000 --- a/roles/httpd +++ b/roles/httpd @@ -1 +1 @@ -Subproject commit 9f0c4b95379983a50ea5d0a80d44786f6318f80e +Subproject commit 2640c870058e778e190d7f747c3a92454f9ce705 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/libvirt b/roles/libvirt index 065797a..0809950 160000 --- a/roles/libvirt +++ b/roles/libvirt @@ -1 +1 @@ -Subproject commit 065797ab9770a25c123b68df7941d6338acba737 +Subproject commit 08099509e46ebbee3aa2761d6137228f13ce875d 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/mariadb b/roles/mariadb index 18b9d66..39adceb 160000 --- a/roles/mariadb +++ b/roles/mariadb @@ -1 +1 @@ -Subproject commit 18b9d668317686ae57517e222c6a6dd0a8332bdb +Subproject commit 39adceb6babc483eaec72e87867497ba0dd87fea diff --git a/roles/mercurial b/roles/mercurial index cd7a5bf..d1c8280 160000 --- a/roles/mercurial +++ b/roles/mercurial @@ -1 +1 @@ -Subproject commit cd7a5bf0de43cdeee81edf7b41a6c114f8f85fd9 +Subproject commit d1c82805a48a8becce602df88f92d6a360257792 diff --git a/roles/molecule b/roles/molecule index 165af54..79deb3b 160000 --- a/roles/molecule +++ b/roles/molecule @@ -1 +1 @@ -Subproject commit 165af548676a417e0730622062f046e017a77a76 +Subproject commit 79deb3bdfcce0e749a06c36161eab6917f3cf753 diff --git a/roles/node b/roles/node index af82626..327513c 160000 --- a/roles/node +++ b/roles/node @@ -1 +1 @@ -Subproject commit af82626a9e370f56007716bc2f1ad8046b6a4ec7 +Subproject commit 327513cc52dd0fa7683b68ea66a0358666a80743 diff --git a/roles/openjdk b/roles/openjdk index 7dc2400..ebd848c 160000 --- a/roles/openjdk +++ b/roles/openjdk @@ -1 +1 @@ -Subproject commit 7dc2400ff1ca526410066f1be6c505c8d5aba5aa +Subproject commit ebd848c24cb3603152fb1004d5cc11cfaa62b3ea diff --git a/roles/packer b/roles/packer index 6d2615f..08ca438 160000 --- a/roles/packer +++ b/roles/packer @@ -1 +1 @@ -Subproject commit 6d2615fffa78f9d634c4ca128826141abda6f8e7 +Subproject commit 08ca438f5a6cb5dfa4d1220c7b8facfd1c6d0d83 diff --git a/roles/perforce b/roles/perforce index ea8564d..34e3f11 160000 --- a/roles/perforce +++ b/roles/perforce @@ -1 +1 @@ -Subproject commit ea8564dc4292fe855247bcc516c3a090a81eead5 +Subproject commit 34e3f112bda8f12847d49536f2d1faa3bb00aa45 diff --git a/roles/php b/roles/php index e383a6d..3acce7a 160000 --- a/roles/php +++ b/roles/php @@ -1 +1 @@ -Subproject commit e383a6d47445dab75e6d810b86d96bb77e2a61d2 +Subproject commit 3acce7a3c472c32bd19f32d3ca9e91563fccaa52 diff --git a/roles/podman b/roles/podman index 9c43c86..c81bd00 160000 --- a/roles/podman +++ b/roles/podman @@ -1 +1 @@ -Subproject commit 9c43c86cd3a6ab49491e8ad070d766a7c8fb898f +Subproject commit c81bd001e2c0ab18b496f740bf1272499d0aec49 diff --git a/roles/postgres b/roles/postgres index 58a289b..6b35f7a 160000 --- a/roles/postgres +++ b/roles/postgres @@ -1 +1 @@ -Subproject commit 58a289ba98723f862bb633f823e26b1008e121f7 +Subproject commit 6b35f7afb1f77a6faf60e459224183f00c2bf7ec 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/rclone b/roles/rclone index 3d80537..8b26e0d 160000 --- a/roles/rclone +++ b/roles/rclone @@ -1 +1 @@ -Subproject commit 3d805371a2e03c55bc6265f43fdb0b4d3c4ae80c +Subproject commit 8b26e0d7a67917db9944dfbfc70f0055189a53db diff --git a/roles/restic b/roles/restic index c46aa16..d219791 160000 --- a/roles/restic +++ b/roles/restic @@ -1 +1 @@ -Subproject commit c46aa16e874593187e2efd6cee0fd6201f34d7f0 +Subproject commit d219791d09f4eda835fcd4f3f27fc456acda1819 diff --git a/roles/skopeo b/roles/skopeo index 3443cdc..acb3648 160000 --- a/roles/skopeo +++ b/roles/skopeo @@ -1 +1 @@ -Subproject commit 3443cdc1c4ae48186fef25785968be51a93544f7 +Subproject commit acb3648157f9a06b69cec167c1cbe32637222baf diff --git a/roles/sqlite b/roles/sqlite index f043ce0..69aee8e 160000 --- a/roles/sqlite +++ b/roles/sqlite @@ -1 +1 @@ -Subproject commit f043ce0b39153d116bede0212d6446302f4dced8 +Subproject commit 69aee8ea10cf127eb42bc5b14cd93fe478e6f770 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/svn b/roles/svn index 7671c05..42e85a6 160000 --- a/roles/svn +++ b/roles/svn @@ -1 +1 @@ -Subproject commit 7671c053abe2192d46c8f0fa7954da3e3f0d5f01 +Subproject commit 42e85a68f8e16eb21a451445af608d19c3648871 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 diff --git a/roles/vagrant b/roles/vagrant index 96d4acd..ee6983d 160000 --- a/roles/vagrant +++ b/roles/vagrant @@ -1 +1 @@ -Subproject commit 96d4acd9655ab3abe517ba61fc77ed83727de71d +Subproject commit ee6983dd098108395bf126ded57844878be4c0d5 diff --git a/roles/vim b/roles/vim index fa65daa..b8f2d67 160000 --- a/roles/vim +++ b/roles/vim @@ -1 +1 @@ -Subproject commit fa65daaed6b1b392ea798c67c01400ff46f68df6 +Subproject commit b8f2d67ba84c112c99f557fd011d59f07098b893 diff --git a/roles/virtualbox b/roles/virtualbox index dcd5a26..afd58e6 160000 --- a/roles/virtualbox +++ b/roles/virtualbox @@ -1 +1 @@ -Subproject commit dcd5a26a7e366e09cbf5851ecdfca905940a5f0e +Subproject commit afd58e6c2172d1f5874246a35c4acd872d984ab2