From c2c542e976d1c7a820731acda105692f72733e33 Mon Sep 17 00:00:00 2001
From: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
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/catatonit |  2 +-
 roles/git       |  2 +-
 roles/gosu      |  2 +-
 roles/locales   |  2 +-
 roles/node      |  2 +-
 roles/php       |  2 +-
 roles/python    |  2 +-
 roles/timezone  |  2 +-
 11 files changed, 24 insertions(+), 38 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 <hswong3i@pantarei-design.com>
+# Copyright 2024 Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
 #
 # 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 <hswong3i@pantarei-design.com>
+# Copyright 2024 Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
 #
 # 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/catatonit b/roles/catatonit
index 3afc678..4d8ba36 160000
--- a/roles/catatonit
+++ b/roles/catatonit
@@ -1 +1 @@
-Subproject commit 3afc6786c7c9a339b4894a78b2bff87dafdc103e
+Subproject commit 4d8ba36735fa9df74521b270d67eb8eb715a18db
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/gosu b/roles/gosu
index 6e67eb3..ef779a3 160000
--- a/roles/gosu
+++ b/roles/gosu
@@ -1 +1 @@
-Subproject commit 6e67eb3d5d3431396c0c34b305e222bc5fcdc3c9
+Subproject commit ef779a326e90fa982d8dcd0922b09cf286aa71d5
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/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/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/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/timezone b/roles/timezone
index 8489e9f..60bbab1 160000
--- a/roles/timezone
+++ b/roles/timezone
@@ -1 +1 @@
-Subproject commit 8489e9f5a0e6bdc58426b7dba4a9c0ea8ea52ffd
+Subproject commit 60bbab11fa6ffd3932ee865f6f595916f9e43d7b