From 2ed7382d887314a4318444df1e706a77f921c8f6 Mon Sep 17 00:00:00 2001
From: Robert de Bock <robert.debock@adfinis.com>
Date: Fri, 15 Mar 2024 10:45:44 +0100
Subject: [PATCH] Allow "yes" and "no" as truthy values, more English, more
 readable.

---
 .ansible-lint                          | 3 ---
 .github/workflows/molecule.yml         | 6 +-----
 .github/workflows/requirements2png.yml | 2 +-
 .yamllint                              | 6 +++++-
 README.md                              | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index 937b336..8115c55 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -12,8 +12,5 @@ exclude_paths:
   - .github
   - requirements.yml
 
-skip_list:
-  - yaml[truthy]
-
 enable_list:
   - name[prefix]
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index 942ce64..b2d5744 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -26,7 +26,7 @@ jobs:
       - lint
     runs-on: ubuntu-20.04
     strategy:
-      fail-fast: false
+      fail-fast: no
       matrix:
         config:
           - image: "debian"
@@ -50,10 +50,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: "${{ github.repository }}"
-      # - name: disable apparmor for mysql
-      #   run: sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
-      # - name: parse apparmor for mysql
-      #   run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
       - name: molecule
         uses: robertdebock/molecule-action@6.0.1
         with:
diff --git a/.github/workflows/requirements2png.yml b/.github/workflows/requirements2png.yml
index f12e0c3..a132e12 100644
--- a/.github/workflows/requirements2png.yml
+++ b/.github/workflows/requirements2png.yml
@@ -31,5 +31,5 @@ jobs:
         uses: ad-m/github-push-action@master
         with:
           directory: ${{ github.repository }}
-          force: true
+          force: yes
           branch: png
diff --git a/.yamllint b/.yamllint
index a7ff098..10d5946 100644
--- a/.yamllint
+++ b/.yamllint
@@ -9,7 +9,11 @@ rules:
     max-spaces-inside: 1
     level: error
   line-length: disable
-  truthy: disable
+  truthy:
+    check-keys: no
+    allowed-values:
+      - "yes"
+      - "no"
 
 ignore: |
   .tox/
diff --git a/README.md b/README.md
index d26137a..2ac5f2d 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ This role has been tested on these [container images](https://hub.docker.com/u/r
 |---------|----|
 |[Debian](https://hub.docker.com/r/robertdebock/debian)|bullseye|
 |[EL](https://hub.docker.com/r/robertdebock/enterpriselinux)|8, 9|
-|[Fedora](https://hub.docker.com/r/robertdebock/fedora/)|38, 39|
+|[Fedora](https://hub.docker.com/r/robertdebock/fedora)|38, 39|
 |[Ubuntu](https://hub.docker.com/r/robertdebock/ubuntu)|all|
 
 The minimum version of Ansible required is 2.12, tests have been done to: