From 3934fd5667d0c999c7c79bc5515a4e379942359d Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 09:39:24 -0500
Subject: [PATCH 01/75] ...

---
 .../workflows/pr-cloudflare-docker-deploy.yml | 17 ++-----------
 ansible/ansible.cfg                           |  2 +-
 ansible/inventory/host_vars.yml               | 25 ++++++++++---------
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 53e461c8..8cbd1fb2 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -51,33 +51,23 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-      # Cache Ansible Galaxy Collections
       - name: Cache Ansible Galaxy Collections
         uses: actions/cache@v3
         with:
-          path: ansible/collections
+          path: ./ansible/collections
           key: ${{ runner.os }}-ansible-${{ hashFiles('./ansible/collections/requirements.yml') }}
           restore-keys: |
             ${{ runner.os }}-ansible-
-      # Install Ansible
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.x'
       - name: Install Ansible
         run: |
           python3 -m pip install --upgrade pip
           pip3 install ansible
       - name: Install Vault
         uses: cpanato/vault-installer@main
-      # Install Galaxy Collections
       - name: Install Galaxy Collections
         if: steps.cache-ansible-galaxy-collections.outputs.cache-hit != 'true'
         run: |
           ansible-galaxy collection install -r ansible/collections/requirements.yml -p ansible/collections
-      # Run Docker Config Deployment
       - name: Docker Config Deployment
         id: docker-config-deploy
         uses: arillso/action.playbook@0.0.8
@@ -86,22 +76,19 @@ jobs:
           diff: true
           galaxy_collections_path: ansible/collections
           galaxy_requirements_file: ansible/collections/requirements.yml
-          inventory: ansible/ansible-inventory.yml
+          inventory: ansible/inventory/hosts.yml
           playbook: ansible/docker_config_deploy.yml
           private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
           verbose: 1
-      # Generate .env File
       - name: Generate .env file for Docker Compose Dry Run
         run: |
           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
-      # Cache .env File
       - name: Cache .env Files
         uses: actions/cache@v3
         with:
           path: .env
           key: ${{ runner.os }}-env-${{ hashFiles('docker-compose.yml') }}
-      # Docker Compose Dry Run
       - name: Docker Compose Dry Run
         uses: yu-ichiro/spin-up-docker-compose-action@v1
         with:
diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg
index b9c645bf..0b15c2ba 100644
--- a/ansible/ansible.cfg
+++ b/ansible/ansible.cfg
@@ -1,6 +1,6 @@
 [defaults]
 # Specify the inventory file
-inventory = hosts.yml
+inventory = inventory/hosts.yml
 
 collections_path = ./collections
 # Set the logging verbosity level
diff --git a/ansible/inventory/host_vars.yml b/ansible/inventory/host_vars.yml
index 3c50f7d9..24038d37 100644
--- a/ansible/inventory/host_vars.yml
+++ b/ansible/inventory/host_vars.yml
@@ -1,12 +1,13 @@
-ansible_host: 192.168.1.254
-ansible_python_interpreter: /usr/bin/python3
-ansible_ssh_port: 22
-ansible_ssh_user: charish
-ansible_ssh_pass: !vault |
-        $ANSIBLE_VAULT;1.1;AES256
-        38346631616139316365316566386362396661323163306339303635646331373061323531626431
-        3435373031363739356261656239633835393963636663370a613166653463656337666366633639
-        37373637326633363430633336646165343764303063663636313835326130663532323037663331
-        6332353339656134370a353435396532663932313535646636333262353238386331313764633635
-        63383065623930653134666261353439366535646661383434386261393232373432353937636535
-        3432336137393737643735346665303832653630316439333565
+rinoa:
+        ansible_host: 192.168.1.254
+        ansible_python_interpreter: /usr/bin/python3
+        ansible_ssh_port: 22
+        ansible_ssh_user: charish
+        ansible_ssh_pass: !vault |
+                $ANSIBLE_VAULT;1.1;AES256
+                38346631616139316365316566386362396661323163306339303635646331373061323531626431
+                3435373031363739356261656239633835393963636663370a613166653463656337666366633639
+                37373637326633363430633336646165343764303063663636313835326130663532323037663331
+                6332353339656134370a353435396532663932313535646636333262353238386331313764633635
+                63383065623930653134666261353439366535646661383434386261393232373432353937636535
+                3432336137393737643735346665303832653630316439333565

From c5beaf1f7dec6d9c34f59bcc3f649ebcbf4176e0 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 09:42:17 -0500
Subject: [PATCH 02/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 8cbd1fb2..e1803b17 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g')'
+          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g')
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}
   docker-compose-ansible-lints:

From ec3f08b88e5efb5333e2ab229d017f240d485082 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 09:44:57 -0500
Subject: [PATCH 03/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index e1803b17..0eb5f015 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -39,6 +39,7 @@ jobs:
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g')
+          echo "${pr_index_old}"
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}
   docker-compose-ansible-lints:

From 6a5b008a5589ea173891afd2457f7d9f10163b39 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 09:46:39 -0500
Subject: [PATCH 04/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 0eb5f015..db55fc11 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,6 +38,7 @@ jobs:
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g'
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g')
           echo "${pr_index_old}"
           pr_index_new=$(expr ${pr_index_old} + 1)

From bfba8a0310c7a1820546e4baa40961dcf40efdbc Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 09:50:43 -0500
Subject: [PATCH 05/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index db55fc11..d6a96e7c 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -30,15 +30,17 @@ jobs:
         id: check-opened-pr-step
         continue-on-error: true
         run: |
+          echo "Adding tea login"
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g'
+          "Checking for existing PRs..."
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}
           echo "exists=$pr_exists" >> $GITHUB_OUTPUT
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g'
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g')
           echo "${pr_index_old}"
           pr_index_new=$(expr ${pr_index_old} + 1)

From ea2df7f80f47fd03e23cff53ce7f92dcce05225b Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 09:51:39 -0500
Subject: [PATCH 06/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index d6a96e7c..37d73e3b 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -34,7 +34,7 @@ jobs:
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
           tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g'
-          "Checking for existing PRs..."
+          echo "Checking for existing PRs..."
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}
           echo "exists=$pr_exists" >> $GITHUB_OUTPUT

From f46f1800eca957b57215e53068feb99a5c465ed3 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 09:52:56 -0500
Subject: [PATCH 07/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 37d73e3b..6e29127a 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g')
+          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv
           echo "${pr_index_old}"
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}

From b34392662c0263fdee3de5067fef4aa83f69d35f Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 09:54:19 -0500
Subject: [PATCH 08/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 6e29127a..1cd86596 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -33,7 +33,7 @@ jobs:
           echo "Adding tea login"
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g'
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv
           echo "Checking for existing PRs..."
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}
@@ -41,7 +41,7 @@ jobs:
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv
+          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g')
           echo "${pr_index_old}"
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}

From 3dbf100575210d3e592641c0a85210b4149b8f48 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 09:55:37 -0500
Subject: [PATCH 09/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 1cd86596..c90c84dc 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -33,7 +33,7 @@ jobs:
           echo "Adding tea login"
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2
           echo "Checking for existing PRs..."
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}

From 2b33a94c1d500792cf99d82d2150437bdb9fe8cf Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:03:59 -0500
Subject: [PATCH 10/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index c90c84dc..171d542c 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -33,7 +33,7 @@ jobs:
           echo "Adding tea login"
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -2 | sed 
           echo "Checking for existing PRs..."
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}
@@ -43,6 +43,7 @@ jobs:
         run: |
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g')
           echo "${pr_index_old}"
+          expr ${pr_index_old} + 1
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}
   docker-compose-ansible-lints:

From 25a226d69988fa9f2266a9632675d3f21811a0a5 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:04:30 -0500
Subject: [PATCH 11/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 171d542c..01fe500f 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -33,7 +33,7 @@ jobs:
           echo "Adding tea login"
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -2 | sed 
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -2
           echo "Checking for existing PRs..."
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}

From 0473f2791a9661a15460d1d1a06b0b5542f5d21d Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:07:33 -0500
Subject: [PATCH 12/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 01fe500f..8fdbe5ae 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -33,15 +33,12 @@ jobs:
           echo "Adding tea login"
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -2
-          echo "Checking for existing PRs..."
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
-          echo ${pr_exists}
           echo "exists=$pr_exists" >> $GITHUB_OUTPUT
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g')
+          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head | awk -F, '{print $1}' | sed -e 's|"||g')
           echo "${pr_index_old}"
           expr ${pr_index_old} + 1
           pr_index_new=$(expr ${pr_index_old} + 1)

From dc16f986a1cb436dda6ab7fde82d7bda1b1d2ed2 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:09:01 -0500
Subject: [PATCH 13/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 8fdbe5ae..cdaec630 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head | awk -F, '{print $1}' | sed -e 's|"||g')
+          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head | awk -F, '{print $1}' | sed -e 's|"||g')
           echo "${pr_index_old}"
           expr ${pr_index_old} + 1
           pr_index_new=$(expr ${pr_index_old} + 1)

From 46ed74e052f77825b81e8078c33979fc9d858231 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:10:26 -0500
Subject: [PATCH 14/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index cdaec630..3e75f990 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,6 +38,7 @@ jobs:
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -2 | awk -F, '{print $1}' | sed -e 's|"||g'
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head | awk -F, '{print $1}' | sed -e 's|"||g')
           echo "${pr_index_old}"
           expr ${pr_index_old} + 1

From 96e01309f55e0cd0fd648c223b5b0bec9cd1cfba Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:14:22 -0500
Subject: [PATCH 15/75] ...

---
 .../workflows/pr-cloudflare-docker-deploy.yml | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 3e75f990..7a104db1 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -30,18 +30,16 @@ jobs:
         id: check-opened-pr-step
         continue-on-error: true
         run: |
-          echo "Adding tea login"
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
+          echo ${pr_exists}
           echo "exists=$pr_exists" >> $GITHUB_OUTPUT
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -2 | awk -F, '{print $1}' | sed -e 's|"||g'
-          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head | awk -F, '{print $1}' | sed -e 's|"||g')
-          echo "${pr_index_old}"
-          expr ${pr_index_old} + 1
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g'
+          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g')'
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}
   docker-compose-ansible-lints:
@@ -54,23 +52,33 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      # Cache Ansible Galaxy Collections
       - name: Cache Ansible Galaxy Collections
         uses: actions/cache@v3
         with:
-          path: ./ansible/collections
+          path: ansible/collections
           key: ${{ runner.os }}-ansible-${{ hashFiles('./ansible/collections/requirements.yml') }}
           restore-keys: |
             ${{ runner.os }}-ansible-
+      # Install Ansible
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
       - name: Install Ansible
         run: |
           python3 -m pip install --upgrade pip
           pip3 install ansible
       - name: Install Vault
         uses: cpanato/vault-installer@main
+      # Install Galaxy Collections
       - name: Install Galaxy Collections
         if: steps.cache-ansible-galaxy-collections.outputs.cache-hit != 'true'
         run: |
           ansible-galaxy collection install -r ansible/collections/requirements.yml -p ansible/collections
+      # Run Docker Config Deployment
       - name: Docker Config Deployment
         id: docker-config-deploy
         uses: arillso/action.playbook@0.0.8
@@ -79,19 +87,22 @@ jobs:
           diff: true
           galaxy_collections_path: ansible/collections
           galaxy_requirements_file: ansible/collections/requirements.yml
-          inventory: ansible/inventory/hosts.yml
+          inventory: ansible/ansible-inventory.yml
           playbook: ansible/docker_config_deploy.yml
           private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
           verbose: 1
+      # Generate .env File
       - name: Generate .env file for Docker Compose Dry Run
         run: |
           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
+      # Cache .env File
       - name: Cache .env Files
         uses: actions/cache@v3
         with:
           path: .env
           key: ${{ runner.os }}-env-${{ hashFiles('docker-compose.yml') }}
+      # Docker Compose Dry Run
       - name: Docker Compose Dry Run
         uses: yu-ichiro/spin-up-docker-compose-action@v1
         with:

From 50d9f9dfa44ea001e0377a1559b270da8b2b932d Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:16:14 -0500
Subject: [PATCH 16/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 7a104db1..1d85fed1 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g'
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g'
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g')'
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}

From 5f3672109bf37b96ed4b2b6154b686c69015bc1d Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:17:20 -0500
Subject: [PATCH 17/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 1d85fed1..77102751 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -32,6 +32,7 @@ jobs:
         run: |
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
+          tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}
           echo "exists=$pr_exists" >> $GITHUB_OUTPUT

From acaab9b5e9f80388a0bf1d826ff13c97cf344f96 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:19:53 -0500
Subject: [PATCH 18/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 77102751..d77b3c9e 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -32,15 +32,14 @@ jobs:
         run: |
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
-          tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}
           echo "exists=$pr_exists" >> $GITHUB_OUTPUT
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g'
-          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g')'
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head | awk -F, '{print $1}' | sed -e 's|"||g'
+          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head | awk -F, '{print $1}' | sed -e 's|"||g')'
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}
   docker-compose-ansible-lints:

From d8d81612490d5349d2f603ba07e80136832d2685 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:21:51 -0500
Subject: [PATCH 19/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index d77b3c9e..9fb3af2d 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head | awk -F, '{print $1}' | sed -e 's|"||g'
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index'
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head | awk -F, '{print $1}' | sed -e 's|"||g')'
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}

From 7611736510b5e0daa7ef6b5bd24795924b45bb30 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:23:10 -0500
Subject: [PATCH 20/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 9fb3af2d..dc2e4948 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,8 +38,8 @@ jobs:
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index'
-          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head | awk -F, '{print $1}' | sed -e 's|"||g')'
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}'
+          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}' | sed -e 's|"||g')'
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}
   docker-compose-ansible-lints:

From a0c4556067d26c46d0fd1896c108c84d2254262b Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:25:50 -0500
Subject: [PATCH 21/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index dc2e4948..81176d59 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -30,7 +30,7 @@ jobs:
         id: check-opened-pr-step
         continue-on-error: true
         run: |
-          tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
+          tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}
@@ -39,7 +39,7 @@ jobs:
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
           tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}'
-          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}' | sed -e 's|"||g')'
+          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}' | sed -e 's|"||g')
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}
   docker-compose-ansible-lints:

From 3b7d428f10815a90c091a6a0d38f6684b39af6da Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:27:19 -0500
Subject: [PATCH 22/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 81176d59..c919e410 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,6 +38,7 @@ jobs:
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
+          tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}'
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}' | sed -e 's|"||g')
           pr_index_new=$(expr ${pr_index_old} + 1)

From e9be8bcc4d2211be1ea6a57772ffcd1c6f77de61 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:28:26 -0500
Subject: [PATCH 23/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index c919e410..adace225 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -31,14 +31,13 @@ jobs:
         continue-on-error: true
         run: |
           tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
-          tea login default gitea-rinoa
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}
           echo "exists=$pr_exists" >> $GITHUB_OUTPUT
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
+          tea login default gitea-rinoa
           tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}'
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}' | sed -e 's|"||g')
           pr_index_new=$(expr ${pr_index_old} + 1)

From 50d981ef213fad8aa231387db4c24de7de8a87fc Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:29:29 -0500
Subject: [PATCH 24/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index adace225..1a94fcf1 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,7 +38,7 @@ jobs:
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
           tea login default gitea-rinoa
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}'
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}' | sed -e 's|"||g')
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}

From beb7e7e5a93a62e1448a2eb97f0e87535671c6ce Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:31:21 -0500
Subject: [PATCH 25/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 1a94fcf1..68a2c817 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,7 +38,7 @@ jobs:
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
           tea login default gitea-rinoa
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | sed -e 's|"||g' | egrep '^[0-9]{1,}' | head
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}' | sed -e 's|"||g')
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}

From 09309ceddc2245ac8ee1299bbf1871611d36e004 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:32:19 -0500
Subject: [PATCH 26/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 68a2c817..1f34ea9f 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,7 +38,7 @@ jobs:
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
           tea login default gitea-rinoa
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | sed -e 's|"||g' | egrep '^[0-9]{1,}' | head
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | sed -e 's|"||g' | egrep '^[0-9]{1,}' | head -1
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}' | sed -e 's|"||g')
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}

From b07056f856ea5913abe0218cad5518bb39ae0a2f Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:41:58 -0500
Subject: [PATCH 27/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 1f34ea9f..8add3406 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,7 +38,7 @@ jobs:
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
           tea login default gitea-rinoa
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | sed -e 's|"||g' | egrep '^[0-9]{1,}' | head -1
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | sed -e 's|"||g' | egrep '^[0-9]'
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}' | sed -e 's|"||g')
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}

From 2679e70122f1a956db23ae108d064fdc5db598ed Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:43:28 -0500
Subject: [PATCH 28/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 8add3406..6d69e5c3 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,7 +38,7 @@ jobs:
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
           tea login default gitea-rinoa
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | sed -e 's|"||g' | egrep '^[0-9]'
+          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | sed -e 's|"||g' | egrep '^[0-9]' | head -1
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}' | sed -e 's|"||g')
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}

From b6e0473bc10a39f1e7a038ef470accaf07c3e2ab Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:45:14 -0500
Subject: [PATCH 29/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 6d69e5c3..866d8ce8 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -38,8 +38,7 @@ jobs:
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
           tea login default gitea-rinoa
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | sed -e 's|"||g' | egrep '^[0-9]' | head -1
-          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | egrep -v 'index' | head -1 | awk -F, '{print $1}' | sed -e 's|"||g')
+          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | sed -e 's|"||g' | egrep '^[0-9]' | head -1 | awk -F"," '{print $1}')
           pr_index_new=$(expr ${pr_index_old} + 1)
           tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}
   docker-compose-ansible-lints:

From 065312b50d281dfee459c79ec4020441e8fd2dd7 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:51:02 -0500
Subject: [PATCH 30/75] Tweaking Ansible steps.

---
 .../workflows/pr-cloudflare-docker-deploy.yml | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 866d8ce8..5f9757ed 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -5,7 +5,6 @@ on:
       - main
     paths:
       - '**.yml'
-
 jobs:
   check-and-create-pr:
     name: Check and Create PR
@@ -51,9 +50,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-      # Cache Ansible Galaxy Collections
       - name: Cache Ansible Galaxy Collections
         uses: actions/cache@v3
         with:
@@ -61,24 +57,17 @@ jobs:
           key: ${{ runner.os }}-ansible-${{ hashFiles('./ansible/collections/requirements.yml') }}
           restore-keys: |
             ${{ runner.os }}-ansible-
-      # Install Ansible
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.x'
       - name: Install Ansible
         run: |
           python3 -m pip install --upgrade pip
           pip3 install ansible
       - name: Install Vault
         uses: cpanato/vault-installer@main
-      # Install Galaxy Collections
       - name: Install Galaxy Collections
         if: steps.cache-ansible-galaxy-collections.outputs.cache-hit != 'true'
         run: |
           ansible-galaxy collection install -r ansible/collections/requirements.yml -p ansible/collections
-      # Run Docker Config Deployment
-      - name: Docker Config Deployment
+      - name: Ansible Dry Run
         id: docker-config-deploy
         uses: arillso/action.playbook@0.0.8
         with:
@@ -86,22 +75,19 @@ jobs:
           diff: true
           galaxy_collections_path: ansible/collections
           galaxy_requirements_file: ansible/collections/requirements.yml
-          inventory: ansible/ansible-inventory.yml
+          inventory: ansible/inventory/hosts.yml
           playbook: ansible/docker_config_deploy.yml
           private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
           verbose: 1
-      # Generate .env File
       - name: Generate .env file for Docker Compose Dry Run
         run: |
           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
-      # Cache .env File
       - name: Cache .env Files
         uses: actions/cache@v3
         with:
           path: .env
           key: ${{ runner.os }}-env-${{ hashFiles('docker-compose.yml') }}
-      # Docker Compose Dry Run
       - name: Docker Compose Dry Run
         uses: yu-ichiro/spin-up-docker-compose-action@v1
         with:
@@ -248,7 +234,7 @@ jobs:
         with:
           galaxy_collections_path: ansible/collections
           galaxy_requirements_file: ansible/collections/requirements.yml
-          inventory: ansible/ansible-inventory
+          inventory: ansible/inventory/hosts.yml
           playbook: ansible/docker_config_deploy.yml
           private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}

From 7ba94ee9ca8c280dda9ba23c9b88765a40d8e466 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 10:57:27 -0500
Subject: [PATCH 31/75] Tweaking Ansible steps.

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 5f9757ed..a1102715 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -58,9 +58,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-ansible-
       - name: Install Ansible
-        run: |
-          python3 -m pip install --upgrade pip
-          pip3 install ansible
+        uses: alex-oleshkevich/setup-ansible@v1.0.1
+        with:
+          version: "9.13.0"
       - name: Install Vault
         uses: cpanato/vault-installer@main
       - name: Install Galaxy Collections

From 3e49ce2c629f553be12a424f5a44fa4df0ebbcaa Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 11:01:56 -0500
Subject: [PATCH 32/75] Bumping Ansible version.

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index a1102715..cadd2a11 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -60,7 +60,7 @@ jobs:
       - name: Install Ansible
         uses: alex-oleshkevich/setup-ansible@v1.0.1
         with:
-          version: "9.13.0"
+          version: "10.7.0"
       - name: Install Vault
         uses: cpanato/vault-installer@main
       - name: Install Galaxy Collections
@@ -219,8 +219,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: main
-      - name: Install Vault
-        uses: cpanato/vault-installer@main
+      # - name: Install Vault
+      #   uses: cpanato/vault-installer@main
       - name: Gotify Notification
         uses: eikendev/gotify-action@master
         with:

From 5f98a0586f951555dbf29f46ee5a118303c2c1fa Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 11:04:16 -0500
Subject: [PATCH 33/75] Bumping Ansible version again.

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index cadd2a11..e6bf63f0 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -39,7 +39,7 @@ jobs:
           tea login default gitea-rinoa
           pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | sed -e 's|"||g' | egrep '^[0-9]' | head -1 | awk -F"," '{print $1}')
           pr_index_new=$(expr ${pr_index_old} + 1)
-          tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}
+          tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - #${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}
   docker-compose-ansible-lints:
     name: Docker Compose & Ansible Lints
     needs: [check-and-create-pr]
@@ -60,7 +60,7 @@ jobs:
       - name: Install Ansible
         uses: alex-oleshkevich/setup-ansible@v1.0.1
         with:
-          version: "10.7.0"
+          version: "11.0.0"
       - name: Install Vault
         uses: cpanato/vault-installer@main
       - name: Install Galaxy Collections

From aa967db0c9c46ac1403de9cc1b1f19a1b716842e Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 11:15:05 -0500
Subject: [PATCH 34/75] Adding caching for Vault.

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index e6bf63f0..977db620 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -15,7 +15,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Cache tea CLI
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /opt/hostedtoolcache/tea/0.9.2/x64
           key: tea-${{ runner.os }}-0.9.2
@@ -51,7 +51,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Cache Ansible Galaxy Collections
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ansible/collections
           key: ${{ runner.os }}-ansible-${{ hashFiles('./ansible/collections/requirements.yml') }}
@@ -61,6 +61,11 @@ jobs:
         uses: alex-oleshkevich/setup-ansible@v1.0.1
         with:
           version: "11.0.0"
+      - name: Cache Vault install
+        uses: actions/cache@v4
+        with:
+          path: /root/.vault/vault
+          key: ${{ runner.os }}-vault-${{ hashFiles('/root/.vault/vault') }}
       - name: Install Vault
         uses: cpanato/vault-installer@main
       - name: Install Galaxy Collections
@@ -84,7 +89,7 @@ jobs:
         run: |
           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
       - name: Cache .env Files
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .env
           key: ${{ runner.os }}-env-${{ hashFiles('docker-compose.yml') }}
@@ -108,7 +113,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Cache flarectl CLI
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.flarectl
           key: flarectl-${{ runner.os }}-${{ hashFiles('workflow-config.yml') }}
@@ -119,7 +124,7 @@ jobs:
           name: 'flarectl'
           version: '0.113.0'
       - name: Cache Subdomain Files
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             compose_subdomains.txt

From d703d18ec895658e8b4d1ecb37b5082c7d25f03b Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 11:19:59 -0500
Subject: [PATCH 35/75] ...

---
 ansible/inventory/host_vars.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansible/inventory/host_vars.yml b/ansible/inventory/host_vars.yml
index 24038d37..3858b29a 100644
--- a/ansible/inventory/host_vars.yml
+++ b/ansible/inventory/host_vars.yml
@@ -11,3 +11,4 @@ rinoa:
                 6332353339656134370a353435396532663932313535646636333262353238386331313764633635
                 63383065623930653134666261353439366535646661383434386261393232373432353937636535
                 3432336137393737643735346665303832653630316439333565
+        ansible_ssh_extra_args: '-o StrictHostChecking=no'

From 98e63119143f17015d32151e13d4f1f3f9e016b3 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 11:29:51 -0500
Subject: [PATCH 36/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 -
 ansible/inventory/host_vars.yml                  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 977db620..32cf3b14 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -82,7 +82,6 @@ jobs:
           galaxy_requirements_file: ansible/collections/requirements.yml
           inventory: ansible/inventory/hosts.yml
           playbook: ansible/docker_config_deploy.yml
-          private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
           verbose: 1
       - name: Generate .env file for Docker Compose Dry Run
diff --git a/ansible/inventory/host_vars.yml b/ansible/inventory/host_vars.yml
index 3858b29a..24038d37 100644
--- a/ansible/inventory/host_vars.yml
+++ b/ansible/inventory/host_vars.yml
@@ -11,4 +11,3 @@ rinoa:
                 6332353339656134370a353435396532663932313535646636333262353238386331313764633635
                 63383065623930653134666261353439366535646661383434386261393232373432353937636535
                 3432336137393737643735346665303832653630316439333565
-        ansible_ssh_extra_args: '-o StrictHostChecking=no'

From 048e454425becb5ee696109d3d7e0f9ae1e47754 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 11:38:47 -0500
Subject: [PATCH 37/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 32cf3b14..977db620 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -82,6 +82,7 @@ jobs:
           galaxy_requirements_file: ansible/collections/requirements.yml
           inventory: ansible/inventory/hosts.yml
           playbook: ansible/docker_config_deploy.yml
+          private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
           verbose: 1
       - name: Generate .env file for Docker Compose Dry Run

From 929005b91d889153768455168e935470fc9e3217 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 11:43:47 -0500
Subject: [PATCH 38/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 977db620..fd393616 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -68,6 +68,12 @@ jobs:
           key: ${{ runner.os }}-vault-${{ hashFiles('/root/.vault/vault') }}
       - name: Install Vault
         uses: cpanato/vault-installer@main
+      - name: Install tea
+        uses: supplypike/setup-bin@v4
+        with:
+          uri: 'https://releases.hashicorp.com/vault/1.18.0/vault_1.18.0_linux_amd64.zip'
+          name: 'vault'
+          version: '1.18.0'
       - name: Install Galaxy Collections
         if: steps.cache-ansible-galaxy-collections.outputs.cache-hit != 'true'
         run: |

From 8b101e7de7a1df9e07a591e49b5d25611f624961 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 11:45:36 -0500
Subject: [PATCH 39/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index fd393616..9056bbce 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -66,9 +66,9 @@ jobs:
         with:
           path: /root/.vault/vault
           key: ${{ runner.os }}-vault-${{ hashFiles('/root/.vault/vault') }}
+      # - name: Install Vault
+      #   uses: cpanato/vault-installer@main
       - name: Install Vault
-        uses: cpanato/vault-installer@main
-      - name: Install tea
         uses: supplypike/setup-bin@v4
         with:
           uri: 'https://releases.hashicorp.com/vault/1.18.0/vault_1.18.0_linux_amd64.zip'

From 699dd6abdf17d3c870c6a90c6e5883e641a23146 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 11:52:47 -0500
Subject: [PATCH 40/75] Tweaking caches; changing private key for Ansible.

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 9056bbce..a4857277 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -15,11 +15,13 @@ jobs:
         with:
           fetch-depth: 1
       - name: Cache tea CLI
+        id: cache-tea
         uses: actions/cache@v4
         with:
           path: /opt/hostedtoolcache/tea/0.9.2/x64
           key: tea-${{ runner.os }}-0.9.2
       - name: Install tea
+        if: steps.cache-tea.outputs.cache-hit != 'true'
         uses: supplypike/setup-bin@v4
         with:
           uri: 'https://gitea.com/gitea/tea/releases/download/v0.9.2/tea-0.9.2-linux-amd64'
@@ -62,13 +64,13 @@ jobs:
         with:
           version: "11.0.0"
       - name: Cache Vault install
+        id: cache-vault
         uses: actions/cache@v4
         with:
-          path: /root/.vault/vault
-          key: ${{ runner.os }}-vault-${{ hashFiles('/root/.vault/vault') }}
-      # - name: Install Vault
-      #   uses: cpanato/vault-installer@main
+          path: /opt/hostedtoolcache/vault/1.18.0/x64
+          key: vault-${{ runner.os }}-1.18.0
       - name: Install Vault
+        if: steps.cache-vault.outputs.cache-hit != 'true'
         uses: supplypike/setup-bin@v4
         with:
           uri: 'https://releases.hashicorp.com/vault/1.18.0/vault_1.18.0_linux_amd64.zip'
@@ -88,7 +90,7 @@ jobs:
           galaxy_requirements_file: ansible/collections/requirements.yml
           inventory: ansible/inventory/hosts.yml
           playbook: ansible/docker_config_deploy.yml
-          private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
+          private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }}
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
           verbose: 1
       - name: Generate .env file for Docker Compose Dry Run

From e0ed8e2995fdfcdb4d5e9c747ddc7e9a2131ae40 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 12:00:45 -0500
Subject: [PATCH 41/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index a4857277..d1ad3d34 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -27,6 +27,7 @@ jobs:
           uri: 'https://gitea.com/gitea/tea/releases/download/v0.9.2/tea-0.9.2-linux-amd64'
           name: 'tea'
           version: '0.9.2'
+          command: cp ./tea /usr/local/bin/tea
       - name: Check if open PR exists
         id: check-opened-pr-step
         continue-on-error: true

From ce3a44fcc43ea09705f7ce8d4285be3521640ec9 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 12:02:12 -0500
Subject: [PATCH 42/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index d1ad3d34..5b0a425b 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -21,13 +21,11 @@ jobs:
           path: /opt/hostedtoolcache/tea/0.9.2/x64
           key: tea-${{ runner.os }}-0.9.2
       - name: Install tea
-        if: steps.cache-tea.outputs.cache-hit != 'true'
         uses: supplypike/setup-bin@v4
         with:
           uri: 'https://gitea.com/gitea/tea/releases/download/v0.9.2/tea-0.9.2-linux-amd64'
           name: 'tea'
           version: '0.9.2'
-          command: cp ./tea /usr/local/bin/tea
       - name: Check if open PR exists
         id: check-opened-pr-step
         continue-on-error: true

From 0f7724d05025a1e8b1da7036f37caf51e7cd34bf Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 12:05:25 -0500
Subject: [PATCH 43/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 5b0a425b..7f8c400d 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -89,7 +89,6 @@ jobs:
           galaxy_requirements_file: ansible/collections/requirements.yml
           inventory: ansible/inventory/hosts.yml
           playbook: ansible/docker_config_deploy.yml
-          private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }}
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
           verbose: 1
       - name: Generate .env file for Docker Compose Dry Run

From 107fead7c439f45952f939deba025438ec89c195 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 12:59:31 -0500
Subject: [PATCH 44/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 7f8c400d..29fe253c 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -82,9 +82,10 @@ jobs:
       - name: Ansible Dry Run
         id: docker-config-deploy
         uses: arillso/action.playbook@0.0.8
+        env:
+          ANSIBLE_HOST_KEY_CHECKING: 'false'
         with:
           check: true
-          diff: true
           galaxy_collections_path: ansible/collections
           galaxy_requirements_file: ansible/collections/requirements.yml
           inventory: ansible/inventory/hosts.yml

From 622e9d5806c55dffd96c002602ad5a41747251a0 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 13:07:46 -0500
Subject: [PATCH 45/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 29fe253c..eca17a38 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -90,6 +90,7 @@ jobs:
           galaxy_requirements_file: ansible/collections/requirements.yml
           inventory: ansible/inventory/hosts.yml
           playbook: ansible/docker_config_deploy.yml
+          private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
           verbose: 1
       - name: Generate .env file for Docker Compose Dry Run

From 2c664798ead60201dcc2657dbd748ae7151c5173 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 13:10:02 -0500
Subject: [PATCH 46/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index eca17a38..62412f86 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -82,8 +82,6 @@ jobs:
       - name: Ansible Dry Run
         id: docker-config-deploy
         uses: arillso/action.playbook@0.0.8
-        env:
-          ANSIBLE_HOST_KEY_CHECKING: 'false'
         with:
           check: true
           galaxy_collections_path: ansible/collections

From 00de82e19afcfcabd72e32600687fd6c96de4507 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 13:51:24 -0500
Subject: [PATCH 47/75] ...

---
 .../workflows/pr-cloudflare-docker-deploy.yml |   4 +-
 ansible/sshprkey                              | 135 ------------------
 2 files changed, 3 insertions(+), 136 deletions(-)
 delete mode 100644 ansible/sshprkey

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 62412f86..e31fc2f1 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -79,6 +79,8 @@ jobs:
         if: steps.cache-ansible-galaxy-collections.outputs.cache-hit != 'true'
         run: |
           ansible-galaxy collection install -r ansible/collections/requirements.yml -p ansible/collections
+      - name: Generate private key file
+        run: echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private_key_file
       - name: Ansible Dry Run
         id: docker-config-deploy
         uses: arillso/action.playbook@0.0.8
@@ -88,7 +90,7 @@ jobs:
           galaxy_requirements_file: ansible/collections/requirements.yml
           inventory: ansible/inventory/hosts.yml
           playbook: ansible/docker_config_deploy.yml
-          private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
+          private_key: private_key_file
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
           verbose: 1
       - name: Generate .env file for Docker Compose Dry Run
diff --git a/ansible/sshprkey b/ansible/sshprkey
deleted file mode 100644
index 1efb24f8..00000000
--- a/ansible/sshprkey
+++ /dev/null
@@ -1,135 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-61353462613766353733306330373236633138333538613634653533316430363930633630626631
-3035333733316133643133356134366366343337363032330a316536353561643436373536336563
-61343566373439376138393533313064313537343831386536623632353262386566633464633661
-6161396538323162310a333866383339393535303236633162303038343134623965646331653262
-35633466383131646465393338313036393164323865353366316366313263303735616539386334
-38666262373336326431306236633662666335303135633965326131663437356565613632636436
-32636362393939336636376363666461653563356431316161306631633634376132623636396461
-61353138323062333937313033313230343136343733303339386362616161383564653363383531
-34646463666166326131626361653666626633366535356534396239613838373063613136303034
-31623363633436303238646233363431343933393534346635383362336361323633396430366561
-30323035613132323634656531353831613961646534306636346466623932383637303830396239
-63646361386263316662393533336536396462623930646466393632363166353234383632313930
-31633030303961343830346334613765333039653734313733396533326434383838626537656564
-66646464616566356533653939333330376339666234656137336361633263396165323963343938
-32313261353237636233343238366334306665353333643933376130336331323132393037663461
-35653132333935636132666363333033396630643466303933393434646432336166633461386263
-66316433663831623730303838343566633237363832353933333063356661353564306461383662
-64646530336662346633616335313064663135613439653663653434623931303333613639356633
-64613639653065613962373233656663366462343663623964313338356462336239373830623466
-31316164346437333331336335613336333935323961353335313635636230386339363262616266
-30316533313664623966323230373137653533626563376638386430613465663937343939626661
-65663031663931383465366663383936343338383937356463623431656633653363363137336261
-31663762643132386461333732613330636433326139663133633462343435353065313431663834
-65616232353539653632393337653863346638316233656636383735386265343434613139636230
-62653232653430356539663334653134663536336136343133666461396232303038343934376463
-62623262356638663538343862376365333235366137383535643431353837303762306637653939
-35333130346237353432616130353261386237666366306436353439396630646430343739323330
-35373664656465626538313139383462356435396631343666623437343933393938666464383834
-36613363663534613566633434643466666365396238363837326362646430353034653133616438
-61336233663332336333643564663336333935343266353265376664666135396530656639623338
-34313462333563636564366330636464656263663236303437366564363439646430356338373337
-32353435313164323636336537386437656439306231656139633234303363623363303937383464
-38663736656663316334303937626264666138643434623736336630353663373035363938373630
-36303933613766613763646638316365306539373332623731373363643261373931393733323038
-61303966373733623362353963346433653931303334313664636531313531373932313465326162
-35366136386236613930663037353765393464366234303165636635393763363433316466363438
-33396334623764356362393035626631666363646433356561333633313837303438333734313836
-38343935626334313063316639356436303331643535633230653439326332386432333831336131
-36633732636537353936663838393937326135623261663565323963393335616665323233336435
-62663662303138643239313061323233316262333362323266333739333564316431303964643033
-62313134613031363063333731653634393363356238313463343066636234356239303139313065
-37346532383133323932323164626663663437313166343235653962383162383138373165663865
-61363237323662616634626137393934396131303934623865363133313863396635353964613863
-61376431663134303863663764353238626131623138623030363734366233613637623932356235
-32343664346566383939353137343434316532393639326435616365326565393736663163303861
-37316461303237333861306465613537626337396532356163356235626563356137316330613134
-65636131663633633936613736326338643133336636316461316335653062666631363933323465
-37656564396161363637363238373635626565373334626539633634336561643364316331633132
-32643431616432616562343538366638663238376332666566343237626539336534663162643062
-37376434363661323137356130623135346430633235643530356366343461326534656562363262
-61653365326363366336363933326232373363626430353561646339376236333639346130383537
-64323832323762353964346434313236613436643762306636666134373730646633313032346136
-37636564633365653234373034303933333864636139666132386665666430663136393939626332
-39343234363032646266323862663937626438623237313865656632306666373663633734353132
-33646531333363313031666565653662333039653866633563626564666434356364396530666532
-36326566663138663031616635366134666364656639313265643662633861353030373132306565
-34366665366562623230393066643538396337653361346130326630326338363937353834333664
-64343633373866333562313535386131323336643336376666663836343265306563356466636630
-65363239333937386161616638393464613339316261313764636535326137663861386330353464
-31653232313930663465663036336232306666363865646231643865316366303561303662383730
-38653566356331613430613462643235366636313961373535366639353565623836336637363233
-35333334613566326637633161346638663136666465356461383765663237623631663138613034
-63633766313032363366633838666131303335656139373661316333326661326238366138343435
-39363861393064333532666330313764316539636364393138613939366536653830653932326638
-63303338333934353536646637333065386532383239643933366438616234353839646533336236
-30633465353730653531663333356636393334616534616635333563363136306233323236653266
-39626434363862656465336364333737623461346231613139373031326531396633366432386561
-63363631376634373862646138363565366533636330623366393530306135363261333433303961
-31366362333263636265386434333566616264666562323762666133646139356364626563343663
-31313834303737356638393065336134323762663265623662333061626239393133363465663537
-37633436356631643465313665646365336134653436633762653430326263623230663335633531
-65313532616430616162386265333336323134393831613663386238383936376665346164646239
-65353362626336373661373364313034313533646132623638623063353937313337313539353134
-62623733363339386465633063306465333632353435363532316263303839343231643235313862
-65346137613863353364383430616465643435356162373731323035623431643639396162646139
-31376430386661303164366365653838636662373762623330306534376231313938633837353663
-30333661303961363434313166323933613131366162623466306133333032353035343836646631
-37336232386364663533313261376230336539303933353339323865363962303733316365316438
-30636235393735396637353331623532376534636465666234373231313039323638366631633234
-61353231666565373764663235313130303365613630393661653434383738333066663961366165
-37323334643932626136636631373761393537343764663931646261613361313261373462386430
-65623634303030366230373165623434316461656661336261626335653031633664336265633431
-63646534616438326139353030336236303734616365383166343537393732623930316235616330
-38366430633062313431396633626665376234626663336534643632616139373566303835303564
-32326363393535663137616430616233663463636133363231663739336264663862613832313663
-66343839323861646635666331613236356336316361376162323964313663393030633332313662
-63323634363435346536663637363935323266346639366161643535313031663261633865313936
-34643163323861663432393330663763346138343930313639613139376138376263323232656631
-66623065326336323631313564666430363836386439396533393665396233323465646636643532
-39666364643933643363666164633931333635313233323365373135363833663964333430653338
-39643961626336376539653461643263626635383662323965363233623435386630653464303938
-64633536386535363031333063353633643632666134323464336166653533396437316566373732
-38366465646165313563396363656266653233393965623036623533623638643166356131623338
-31393863346564303865336430376462333831623339653935353664376166636665626637313031
-33353166366634656333663461353631633837663934333737393366373364663833313230333735
-62333333353361653533643233613464616664633736613138636666613932613061666230373565
-37643634376363373031643731366262303733313534303661326462366632656163393532666265
-66383061363336343837373831326135383430383831366563376165303661663732323437623134
-66633763313336376262376233363862663132356164313336393566313062386231633635653332
-65616335343738663565623161383730643735323937316535653032633032363532633434393639
-30343635666162373762376131663336653838626331306365333234333438306433666434613938
-34346137326264633366663332666330646364333938663262633637356263643937343262623834
-32323835623061656535313766643437373066363832353562633463636530386235313365376561
-62303162316365396164333065653638643065633665646436386365323263366237616138636531
-35313337643361656166643036333631656438326365386161303635613363383636346437613434
-66313631343863343939333261396266346333323632623361656638306234656330633635333733
-38376531353230343933613961376638353063346435623366343930313237663733346531323135
-64336239396137353465393361346437383565393638343930356365313163363264333834326139
-30383763336137346530653961613434306664373264316434616263306562623335663330616564
-37346565653562363866343937653238353332336135663766383239653038643130373165353462
-62306238643536336235623638363734656366663530373264663861313438373437306666393731
-33333237636535623631303134303138353434323533653931653762323330643466306565313630
-35366663346165333833626630323330336336303166643463396437383730643166303965363838
-39313739333334613262393135616232316436643835636430653237383739653536373962346161
-30643639303938393266613734346234316331633834643337373265313763393766323431333439
-32353036326333356535633136376630623733306636663363393434653033636431643063393939
-63653164363435306232636536333739633832346137373130303265383135396334343062396463
-30303434613034316365653464343265393736386265623366643763386265316462396464346162
-32623138393363613636336435666233366630653030326561336338306339663837303033366134
-32616334313539653763396164656133613736303335646564633736393463313261613831623664
-38613032333766376135363437313561643863333036363766343333303664303738623738666634
-66623032306337326361383466303431616531313535316134336338656437653134653738393662
-64373437363762633261373533313730383932306161376636393261623534663737633639653462
-66663732306239313764383264663362346433346265303732333535613563613033616165343037
-62633565643433353332663534366564616132646337356265346234366537653561316531356366
-61666163303362666232613164373963383131616336613030626262306136636265633531306133
-64646332336137353765626439346162636233363463313437633763656361653565343835393762
-64343433373938636461646265303238646635346662626331333436343535636231666563326462
-35373435396233313464366636343165376662616134633037376161393565336164646663323266
-36386634383066383763353535616466396464623836646439323535323839646632323839653838
-35383136343333326565383261653763383639313631663631343730353532613764306630326262
-37363665313637633162373264623464346431306537386231613131663934623933353433623031
-66326331666132643637323937376164306565343035363032623231303962313433356362613362
-3233366530336137393333373639613864613561363465306239

From dfea0db5d8dc94bdc415c53323ad42062cf68da8 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 13:57:50 -0500
Subject: [PATCH 48/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index e31fc2f1..998d9563 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -79,8 +79,6 @@ jobs:
         if: steps.cache-ansible-galaxy-collections.outputs.cache-hit != 'true'
         run: |
           ansible-galaxy collection install -r ansible/collections/requirements.yml -p ansible/collections
-      - name: Generate private key file
-        run: echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private_key_file
       - name: Ansible Dry Run
         id: docker-config-deploy
         uses: arillso/action.playbook@0.0.8
@@ -90,9 +88,9 @@ jobs:
           galaxy_requirements_file: ansible/collections/requirements.yml
           inventory: ansible/inventory/hosts.yml
           playbook: ansible/docker_config_deploy.yml
-          private_key: private_key_file
+          private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
-          verbose: 1
+          verbose: 2
       - name: Generate .env file for Docker Compose Dry Run
         run: |
           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env

From cfe1a0ca533de7b0be985b3ce9ce5ece19deb024 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 14:05:32 -0500
Subject: [PATCH 49/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 998d9563..a050a90b 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -81,16 +81,11 @@ jobs:
           ansible-galaxy collection install -r ansible/collections/requirements.yml -p ansible/collections
       - name: Ansible Dry Run
         id: docker-config-deploy
-        uses: arillso/action.playbook@0.0.8
+        uses: SakulFlee/GitHub-Action-Ansible@v0.0.1
         with:
-          check: true
-          galaxy_collections_path: ansible/collections
-          galaxy_requirements_file: ansible/collections/requirements.yml
-          inventory: ansible/inventory/hosts.yml
-          playbook: ansible/docker_config_deploy.yml
-          private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
-          vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
-          verbose: 2
+          playbook_file: ansible/docker_config_deploy.yml
+          inventory_file: ansible/inventory/hosts.yml
+          requirements_file: ansible/collections/requirements.yml
       - name: Generate .env file for Docker Compose Dry Run
         run: |
           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env

From cfe75a3f75bbebf2a09ab466dd3fce604c6d57ab Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 14:21:28 -0500
Subject: [PATCH 50/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index a050a90b..05611063 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -79,13 +79,20 @@ jobs:
         if: steps.cache-ansible-galaxy-collections.outputs.cache-hit != 'true'
         run: |
           ansible-galaxy collection install -r ansible/collections/requirements.yml -p ansible/collections
+      - name: Generate private key for Ansible
+        run: echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private-ssh-key
       - name: Ansible Dry Run
         id: docker-config-deploy
         uses: SakulFlee/GitHub-Action-Ansible@v0.0.1
         with:
-          playbook_file: ansible/docker_config_deploy.yml
-          inventory_file: ansible/inventory/hosts.yml
-          requirements_file: ansible/collections/requirements.yml
+          check: true
+          extra_vars: 'ansible_ssh_private_key_file=private-ssh-key'
+          galaxy_collections_path: ansible/collections
+          galaxy_requirements_file: ansible/collections/requirements.yml
+          inventory: ansible/inventory/hosts.yml
+          playbook: ansible/docker_config_deploy.yml
+          vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
+          verbose: 2
       - name: Generate .env file for Docker Compose Dry Run
         run: |
           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env

From 45e9bf2947f25144b2516a9c3d5359e356a4d330 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 15:38:20 -0500
Subject: [PATCH 51/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 05611063..8578cc37 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -79,20 +79,18 @@ jobs:
         if: steps.cache-ansible-galaxy-collections.outputs.cache-hit != 'true'
         run: |
           ansible-galaxy collection install -r ansible/collections/requirements.yml -p ansible/collections
-      - name: Generate private key for Ansible
-        run: echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private-ssh-key
       - name: Ansible Dry Run
         id: docker-config-deploy
-        uses: SakulFlee/GitHub-Action-Ansible@v0.0.1
+        uses: euclid1990/actions-ansible@v2
         with:
-          check: true
-          extra_vars: 'ansible_ssh_private_key_file=private-ssh-key'
-          galaxy_collections_path: ansible/collections
-          galaxy_requirements_file: ansible/collections/requirements.yml
+          # check: true
+          # extra_vars: 'ansible_ssh_private_key_file=private-ssh-key'
+          # galaxy_collections_path: ansible/collections
+          # galaxy_requirements_file: ansible/collections/requirements.yml
           inventory: ansible/inventory/hosts.yml
           playbook: ansible/docker_config_deploy.yml
-          vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
-          verbose: 2
+          # vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
+          # verbose: 2
       - name: Generate .env file for Docker Compose Dry Run
         run: |
           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env

From a188671e6231fc40a377e0e679236e6ef0b2872e Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 15:53:45 -0500
Subject: [PATCH 52/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 8578cc37..87fbeb7d 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -81,16 +81,10 @@ jobs:
           ansible-galaxy collection install -r ansible/collections/requirements.yml -p ansible/collections
       - name: Ansible Dry Run
         id: docker-config-deploy
-        uses: euclid1990/actions-ansible@v2
-        with:
-          # check: true
-          # extra_vars: 'ansible_ssh_private_key_file=private-ssh-key'
-          # galaxy_collections_path: ansible/collections
-          # galaxy_requirements_file: ansible/collections/requirements.yml
-          inventory: ansible/inventory/hosts.yml
-          playbook: ansible/docker_config_deploy.yml
-          # vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
-          # verbose: 2
+        run: |
+          cd ansible/
+          echo "${{ secrets.ANSIBLE_VAULT_PASSWORD }}" > vault_pass
+          ansible-playbook --check docker_config_deploy.yml -i inventory/hosts.yml --vault-pass-file vault_pass
       - name: Generate .env file for Docker Compose Dry Run
         run: |
           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env

From 0ae7f8b89a7137a626a4aae7d7543f13e5c312c4 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 16:01:16 -0500
Subject: [PATCH 53/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 87fbeb7d..d1b41986 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -83,8 +83,9 @@ jobs:
         id: docker-config-deploy
         run: |
           cd ansible/
+          echo ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }} > private-ssh-key
           echo "${{ secrets.ANSIBLE_VAULT_PASSWORD }}" > vault_pass
-          ansible-playbook --check docker_config_deploy.yml -i inventory/hosts.yml --vault-pass-file vault_pass
+          ansible-playbook --check docker_config_deploy.yml -i inventory/hosts.yml --vault-pass-file vault_pass --ssh-extra-args "-i private-ssh-key"
       - name: Generate .env file for Docker Compose Dry Run
         run: |
           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env

From b71d62f334596151a00efa281c285576cf7a8667 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 16:04:42 -0500
Subject: [PATCH 54/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index d1b41986..8f66e8c2 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -83,7 +83,7 @@ jobs:
         id: docker-config-deploy
         run: |
           cd ansible/
-          echo ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }} > private-ssh-key
+          echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private-ssh-key
           echo "${{ secrets.ANSIBLE_VAULT_PASSWORD }}" > vault_pass
           ansible-playbook --check docker_config_deploy.yml -i inventory/hosts.yml --vault-pass-file vault_pass --ssh-extra-args "-i private-ssh-key"
       - name: Generate .env file for Docker Compose Dry Run

From 9f39c234c015ffe4f43ae7242082ae802776a4a7 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 16:07:09 -0500
Subject: [PATCH 55/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 8f66e8c2..5cf97472 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -85,7 +85,7 @@ jobs:
           cd ansible/
           echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private-ssh-key
           echo "${{ secrets.ANSIBLE_VAULT_PASSWORD }}" > vault_pass
-          ansible-playbook --check docker_config_deploy.yml -i inventory/hosts.yml --vault-pass-file vault_pass --ssh-extra-args "-i private-ssh-key"
+          ansible-playbook --check -i inventory/hosts.yml --vault-pass-file=vault_pass --ssh-extra-args="-i private-ssh-key" docker_config_deploy.yml
       - name: Generate .env file for Docker Compose Dry Run
         run: |
           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env

From ba22b868467b2109179b6e4c19394ea52bb40c02 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 16:13:39 -0500
Subject: [PATCH 56/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 5cf97472..ed2f0b73 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -83,7 +83,7 @@ jobs:
         id: docker-config-deploy
         run: |
           cd ansible/
-          echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private-ssh-key
+          echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private-ssh-key ; chmod 644 private-ssh-key
           echo "${{ secrets.ANSIBLE_VAULT_PASSWORD }}" > vault_pass
           ansible-playbook --check -i inventory/hosts.yml --vault-pass-file=vault_pass --ssh-extra-args="-i private-ssh-key" docker_config_deploy.yml
       - name: Generate .env file for Docker Compose Dry Run

From 39fa2572137fc30b3c4c0da92acd6c0c97552e8f Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 16:20:53 -0500
Subject: [PATCH 57/75] Adding known_hosts....

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index ed2f0b73..c97ef056 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -83,6 +83,7 @@ jobs:
         id: docker-config-deploy
         run: |
           cd ansible/
+          echo "${{ secrets.RINOA_ANSIBLE_KNOWN_HOSTS }}" > /root/.ssh/known_hosts
           echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private-ssh-key ; chmod 644 private-ssh-key
           echo "${{ secrets.ANSIBLE_VAULT_PASSWORD }}" > vault_pass
           ansible-playbook --check -i inventory/hosts.yml --vault-pass-file=vault_pass --ssh-extra-args="-i private-ssh-key" docker_config_deploy.yml

From b2cb059d0f950faff7b011483e4ebeb3e0e850d6 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 16:25:37 -0500
Subject: [PATCH 58/75] Adding known_hosts....

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index c97ef056..ef88223e 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -83,10 +83,10 @@ jobs:
         id: docker-config-deploy
         run: |
           cd ansible/
-          echo "${{ secrets.RINOA_ANSIBLE_KNOWN_HOSTS }}" > /root/.ssh/known_hosts
-          echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private-ssh-key ; chmod 644 private-ssh-key
+          echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private-ssh-key ; chmod 600 private-ssh-key
+            6 private-ssh-key
           echo "${{ secrets.ANSIBLE_VAULT_PASSWORD }}" > vault_pass
-          ansible-playbook --check -i inventory/hosts.yml --vault-pass-file=vault_pass --ssh-extra-args="-i private-ssh-key" docker_config_deploy.yml
+          ansible-playbook --check -i inventory/hosts.yml --vault-pass-file=vault_pass docker_config_deploy.yml
       - name: Generate .env file for Docker Compose Dry Run
         run: |
           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env

From 67fb2aff8426ef3a249232e9a5fb85a7aa982a49 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 16:35:09 -0500
Subject: [PATCH 59/75] Adding known_hosts....

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index ef88223e..fb039a58 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -84,7 +84,6 @@ jobs:
         run: |
           cd ansible/
           echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private-ssh-key ; chmod 600 private-ssh-key
-            6 private-ssh-key
           echo "${{ secrets.ANSIBLE_VAULT_PASSWORD }}" > vault_pass
           ansible-playbook --check -i inventory/hosts.yml --vault-pass-file=vault_pass docker_config_deploy.yml
       - name: Generate .env file for Docker Compose Dry Run

From 9a4bed728a25a76389606f77cebb7ffc9f8188d6 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 16:46:38 -0500
Subject: [PATCH 60/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index fb039a58..7c77f282 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -83,6 +83,7 @@ jobs:
         id: docker-config-deploy
         run: |
           cd ansible/
+          echo "${{ secrets.RINOA_ANSIBLE_KNOWN_HOSTS }}" > /root/.ssh/known_hosts
           echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private-ssh-key ; chmod 600 private-ssh-key
           echo "${{ secrets.ANSIBLE_VAULT_PASSWORD }}" > vault_pass
           ansible-playbook --check -i inventory/hosts.yml --vault-pass-file=vault_pass docker_config_deploy.yml

From bf4464b661913bcc92283a7db7fd5b9f96caff20 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 21:13:44 -0500
Subject: [PATCH 61/75] Fixing pipeline.

---
 .../workflows/pr-cloudflare-docker-deploy.yml | 65 +++++++------------
 1 file changed, 25 insertions(+), 40 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 7c77f282..80e54c45 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -5,6 +5,7 @@ on:
       - main
     paths:
       - '**.yml'
+
 jobs:
   check-and-create-pr:
     name: Check and Create PR
@@ -15,8 +16,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Cache tea CLI
-        id: cache-tea
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: /opt/hostedtoolcache/tea/0.9.2/x64
           key: tea-${{ runner.os }}-0.9.2
@@ -30,17 +30,17 @@ jobs:
         id: check-opened-pr-step
         continue-on-error: true
         run: |
-          tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
+          tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
+          tea login default gitea-rinoa
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}
           echo "exists=$pr_exists" >> $GITHUB_OUTPUT
       - name: Create PR
         if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
         run: |
-          tea login default gitea-rinoa
-          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | sed -e 's|"||g' | egrep '^[0-9]' | head -1 | awk -F"," '{print $1}')
+          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | head -2 | tail -1 | awk -F, '{print $1}' | sed -e 's|"||g')'
           pr_index_new=$(expr ${pr_index_old} + 1)
-          tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - #${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}
+          tea pr c -r ${{ github.repository }} -t "Automated PR for ${{ github.ref_name }} - ${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }}
   docker-compose-ansible-lints:
     name: Docker Compose & Ansible Lints
     needs: [check-and-create-pr]
@@ -52,46 +52,31 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Cache Ansible Galaxy Collections
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ansible/collections
           key: ${{ runner.os }}-ansible-${{ hashFiles('./ansible/collections/requirements.yml') }}
           restore-keys: |
             ${{ runner.os }}-ansible-
-      - name: Install Ansible
-        uses: alex-oleshkevich/setup-ansible@v1.0.1
-        with:
-          version: "11.0.0"
-      - name: Cache Vault install
-        id: cache-vault
-        uses: actions/cache@v4
-        with:
-          path: /opt/hostedtoolcache/vault/1.18.0/x64
-          key: vault-${{ runner.os }}-1.18.0
       - name: Install Vault
-        if: steps.cache-vault.outputs.cache-hit != 'true'
-        uses: supplypike/setup-bin@v4
+        uses: cpanato/vault-installer@main
+      - name: Ansible Playbook Dry Run
+        uses: dawidd6/action-ansible-playbook@v2
         with:
-          uri: 'https://releases.hashicorp.com/vault/1.18.0/vault_1.18.0_linux_amd64.zip'
-          name: 'vault'
-          version: '1.18.0'
-      - name: Install Galaxy Collections
-        if: steps.cache-ansible-galaxy-collections.outputs.cache-hit != 'true'
-        run: |
-          ansible-galaxy collection install -r ansible/collections/requirements.yml -p ansible/collections
-      - name: Ansible Dry Run
-        id: docker-config-deploy
-        run: |
-          cd ansible/
-          echo "${{ secrets.RINOA_ANSIBLE_KNOWN_HOSTS }}" > /root/.ssh/known_hosts
-          echo "${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}" > private-ssh-key ; chmod 600 private-ssh-key
-          echo "${{ secrets.ANSIBLE_VAULT_PASSWORD }}" > vault_pass
-          ansible-playbook --check -i inventory/hosts.yml --vault-pass-file=vault_pass docker_config_deploy.yml
+          directory: ansible/
+          playbook: docker_config_deploy.yml
+          key: ${{secrets.RINOA_ANSIBLE_PRIVATE_KEY}}
+          options: |
+            --inventory inventory/hosts.yml
+            --verbose
+            --check
+          requirements: ansible/collections/requirements.yml
+          vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
       - name: Generate .env file for Docker Compose Dry Run
         run: |
           vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
       - name: Cache .env Files
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: .env
           key: ${{ runner.os }}-env-${{ hashFiles('docker-compose.yml') }}
@@ -115,7 +100,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Cache flarectl CLI
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.flarectl
           key: flarectl-${{ runner.os }}-${{ hashFiles('workflow-config.yml') }}
@@ -126,7 +111,7 @@ jobs:
           name: 'flarectl'
           version: '0.113.0'
       - name: Cache Subdomain Files
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: |
             compose_subdomains.txt
@@ -226,8 +211,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: main
-      # - name: Install Vault
-      #   uses: cpanato/vault-installer@main
+      - name: Install Vault
+        uses: cpanato/vault-installer@main
       - name: Gotify Notification
         uses: eikendev/gotify-action@master
         with:
@@ -241,7 +226,7 @@ jobs:
         with:
           galaxy_collections_path: ansible/collections
           galaxy_requirements_file: ansible/collections/requirements.yml
-          inventory: ansible/inventory/hosts.yml
+          inventory: ansible/ansible-inventory
           playbook: ansible/docker_config_deploy.yml
           private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}

From 20d6780df0f7ccf4fddbdfb0a3b002381930160a Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 21:23:30 -0500
Subject: [PATCH 62/75] Tweaking Ansible dry run.

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 80e54c45..292cb2ca 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -70,7 +70,7 @@ jobs:
             --inventory inventory/hosts.yml
             --verbose
             --check
-          requirements: ansible/collections/requirements.yml
+          requirements: collections/requirements.yml
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
       - name: Generate .env file for Docker Compose Dry Run
         run: |

From 8a01b85011a71ac2330278627a12454453597660 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 21:32:05 -0500
Subject: [PATCH 63/75] Tweaking Ansible dry run.

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 292cb2ca..2eb6c2ad 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -58,6 +58,10 @@ jobs:
           key: ${{ runner.os }}-ansible-${{ hashFiles('./ansible/collections/requirements.yml') }}
           restore-keys: |
             ${{ runner.os }}-ansible-
+      - name: "Install Ansible"
+        uses: alex-oleshkevich/setup-ansible@v1.0.1
+        with:
+          version: "11.0.0"
       - name: Install Vault
         uses: cpanato/vault-installer@main
       - name: Ansible Playbook Dry Run

From 82f7dc66caf5f10fc9c40c1368e9223822c3c0c5 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sun, 19 Jan 2025 21:40:50 -0500
Subject: [PATCH 64/75] Adding venv.

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 2eb6c2ad..6f8a0419 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -58,12 +58,16 @@ jobs:
           key: ${{ runner.os }}-ansible-${{ hashFiles('./ansible/collections/requirements.yml') }}
           restore-keys: |
             ${{ runner.os }}-ansible-
-      - name: "Install Ansible"
+      - name: Install Ansible
         uses: alex-oleshkevich/setup-ansible@v1.0.1
         with:
           version: "11.0.0"
       - name: Install Vault
         uses: cpanato/vault-installer@main
+      - uses: getsentry/action-setup-venv@v2.1.0
+        id: venv-setup
+        with:
+          install-cmd: pip install hvac
       - name: Ansible Playbook Dry Run
         uses: dawidd6/action-ansible-playbook@v2
         with:

From 576734e22a830677064850afa1d0b28029fe967f Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Mon, 20 Jan 2025 07:59:37 -0500
Subject: [PATCH 65/75] Attempting hvac install step.

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 6f8a0419..165e9761 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -64,10 +64,8 @@ jobs:
           version: "11.0.0"
       - name: Install Vault
         uses: cpanato/vault-installer@main
-      - uses: getsentry/action-setup-venv@v2.1.0
-        id: venv-setup
-        with:
-          install-cmd: pip install hvac
+      - name: Install hvac
+        run: pip install hvac
       - name: Ansible Playbook Dry Run
         uses: dawidd6/action-ansible-playbook@v2
         with:

From 00ccf6433d3e10f86b2af3765b7f7af163eb10d9 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Mon, 20 Jan 2025 08:07:47 -0500
Subject: [PATCH 66/75] File fixes.

---
 .cache_ggshield                                               | 2 +-
 .../app-configs/{sabnzbd.ini.j2 => sabnzbd_sabnzbd.ini.j2}    | 0
 ansible/app-configs/sonarr_config.xml.j2                      | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename ansible/app-configs/{sabnzbd.ini.j2 => sabnzbd_sabnzbd.ini.j2} (100%)

diff --git a/.cache_ggshield b/.cache_ggshield
index 957891a4..7442351a 100644
--- a/.cache_ggshield
+++ b/.cache_ggshield
@@ -1 +1 @@
-{"last_found_secrets": [{"name": "Generic Password - /home/charish/app-configs/searxng_settings.yml.j2", "match": "6e0d657eb1f0fbc40cf0b8f3c3873ef627cc9cb7c4108d1c07d979c04bc8a4bb"}]}
\ No newline at end of file
+{"last_found_secrets": [{"name": "Generic High Entropy Secret - /home/charish/rinoa-docker/ansible/app-configs/sonarr_config.xml.j2", "match": "c1b351cf974fcfe8b860531a7231ca432e176244f074a4c003a2b1f9db2ab12e"}]}
\ No newline at end of file
diff --git a/ansible/app-configs/sabnzbd.ini.j2 b/ansible/app-configs/sabnzbd_sabnzbd.ini.j2
similarity index 100%
rename from ansible/app-configs/sabnzbd.ini.j2
rename to ansible/app-configs/sabnzbd_sabnzbd.ini.j2
diff --git a/ansible/app-configs/sonarr_config.xml.j2 b/ansible/app-configs/sonarr_config.xml.j2
index 1afdc004..cb4f0f35 100644
--- a/ansible/app-configs/sonarr_config.xml.j2
+++ b/ansible/app-configs/sonarr_config.xml.j2
@@ -1,5 +1,5 @@
 {% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = rinoa-docker/env %}
+{% set secrets_path = 'rinoa-docker/env' %}
 
 <Config>
   <LogLevel>info</LogLevel>
@@ -8,7 +8,7 @@
   <SslPort>9898</SslPort>
   <UrlBase></UrlBase>
   <BindAddress>*</BindAddress>
-  <ApiKey>386baee1c0e741bea4a91f1f39c57f68</ApiKey>
+  <ApiKey>{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['SONARR_API_KEY'] }}</ApiKey>
   <AuthenticationMethod>Forms</AuthenticationMethod>
   <UpdateMechanism>Docker</UpdateMechanism>
   <LaunchBrowser>True</LaunchBrowser>

From 5533460a02a9816ee9fe26b62e37090cab4415ec Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Mon, 20 Jan 2025 08:10:58 -0500
Subject: [PATCH 67/75] ...

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9455a820..2bbb354e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-**/.cache.ggshield
+**/.cache_ggshield
 ansible/collections/ansible_collections/
\ No newline at end of file

From 142dcffb9ed2da3f9fcb000c0f46c62c5cf3be9a Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Mon, 20 Jan 2025 08:12:35 -0500
Subject: [PATCH 68/75] ...

---
 .cache_ggshield                                  | 1 -
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 .cache_ggshield

diff --git a/.cache_ggshield b/.cache_ggshield
deleted file mode 100644
index 7442351a..00000000
--- a/.cache_ggshield
+++ /dev/null
@@ -1 +0,0 @@
-{"last_found_secrets": [{"name": "Generic High Entropy Secret - /home/charish/rinoa-docker/ansible/app-configs/sonarr_config.xml.j2", "match": "c1b351cf974fcfe8b860531a7231ca432e176244f074a4c003a2b1f9db2ab12e"}]}
\ No newline at end of file
diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 165e9761..8489c7fb 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -74,7 +74,7 @@ jobs:
           key: ${{secrets.RINOA_ANSIBLE_PRIVATE_KEY}}
           options: |
             --inventory inventory/hosts.yml
-            --verbose
+            --diff
             --check
           requirements: collections/requirements.yml
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}

From a38c8b50a292b6de6caf6f2eda97e4791981c318 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Mon, 20 Jan 2025 08:22:53 -0500
Subject: [PATCH 69/75] Tweaking Ansible deployment step.

---
 .../workflows/pr-cloudflare-docker-deploy.yml | 23 ++++++++++---------
 ansible/docker_config_deploy.yml              |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 8489c7fb..8954738c 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -219,6 +219,18 @@ jobs:
           ref: main
       - name: Install Vault
         uses: cpanato/vault-installer@main
+      - name: Install hvac
+        run: pip install hvac
+      - name: Deploy Docker Configs via Ansible
+        uses: dawidd6/action-ansible-playbook@v2
+        with:
+          directory: ansible/
+          playbook: docker_config_deploy.yml
+          key: ${{secrets.RINOA_ANSIBLE_PRIVATE_KEY}}
+          options: |
+            --inventory inventory/hosts.yml
+          requirements: collections/requirements.yml
+          vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
       - name: Gotify Notification
         uses: eikendev/gotify-action@master
         with:
@@ -226,17 +238,6 @@ jobs:
           gotify_app_token: '${{ secrets.gotify_app_token }}'
           notification_title: 'Ansible Config Deployment @ Rinoa'
           notification_message: 'Deployment completed successfully.'
-      - name: Docker Config Deployment via Ansible
-        id: docker-config-deploy
-        uses: arillso/action.playbook@0.0.8
-        with:
-          galaxy_collections_path: ansible/collections
-          galaxy_requirements_file: ansible/collections/requirements.yml
-          inventory: ansible/ansible-inventory
-          playbook: ansible/docker_config_deploy.yml
-          private_key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
-          vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
-          verbose: 1
       - name: Generate .env file for deployment
         run: |
            vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
diff --git a/ansible/docker_config_deploy.yml b/ansible/docker_config_deploy.yml
index 9b6cb950..798016c4 100644
--- a/ansible/docker_config_deploy.yml
+++ b/ansible/docker_config_deploy.yml
@@ -1,5 +1,5 @@
 ---
-- name: Deploy config templates and trigger GitHub workflow
+- name: Deploy Docker Service Configurations
   hosts: rinoa
   vars:
     appdata_base_path: "~/.docker/config/appdata"

From 97b5b45289e0a8c0e9c65fcb0d3e7bc0258b040c Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Mon, 20 Jan 2025 08:29:14 -0500
Subject: [PATCH 70/75] File naming fix.

---
 .../gitea_gitea-sonarqube-bot_config.yaml.j2  | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 ansible/app-configs/gitea_gitea-sonarqube-bot_config.yaml.j2

diff --git a/ansible/app-configs/gitea_gitea-sonarqube-bot_config.yaml.j2 b/ansible/app-configs/gitea_gitea-sonarqube-bot_config.yaml.j2
new file mode 100644
index 00000000..90b9fb69
--- /dev/null
+++ b/ansible/app-configs/gitea_gitea-sonarqube-bot_config.yaml.j2
@@ -0,0 +1,81 @@
+{% set vault_addr = 'https://vault.trez.wtf' %}
+{% set secrets_path = 'rinoa-docker/env' %}
+
+# Gitea related configuration. Necessary for adding/updating comments on repository pull requests
+gitea:
+  # Endpoint of your Gitea instance. Must be expandable by '/api/v1' to form the API base path as shown in Swagger UI.
+  url: https://git.trez.wtf
+
+  # Created access token for the user that shall be used as bot account.
+  # User needs "Read project" permissions with access to "Pull Requests"
+  token:
+    value: "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['GITEA_SONARQUBE_BOT_GITEA_TOKEN'] }}"
+    # # or path to file containing the plain text secret
+    # file: /path/to/gitea/token
+
+  # If the sent webhook has a signature header, the bot validates the request payload. If the value does not match, the
+  # request will be ignored.
+  # The bot looks for `X-Gitea-Signature` header containing the sha256 hmac hash of the plain text secret. If the header
+  # exists and no webhookSecret is defined here, the bot will ignore the request, because it cannot be validated.
+  webhook:
+    secret: "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['GITEA_SONARQUBE_BOT_GITEA_WEBHOOK_SECRET'] }}"
+    # # or path to file containing the plain text secret
+    # secretFile: /path/to/gitea/webhook/secret
+
+  # Pull Request status check settings.
+  statusCheck:
+    # Configure the label/name of the PR status check.
+    name: "gitea-sonarqube-bot"
+
+# SonarQube related configuration. Necessary for requesting data from the API and processing the webhook.
+sonarqube:
+  # Endpoint of your SonarQube instance. Must be expandable by '/api' to form the API base path.
+  url: https://sqube.trez.wtf
+
+  # Created access token for the user that shall be used as bot account.
+  # User needs "Browse on project" permissions
+  token:
+    value: "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['GITEA_SONARQUBE_BOT_SQUBE_TOKEN'] }}"
+    # # or path to file containing the plain text secret
+    # file: /path/to/sonarqube/token
+
+  # If the sent webhook has a signature header, the bot validates the request payload. If the value does not match, the
+  # request will be ignored.
+  # The bot looks for `X-Sonar-Webhook-HMAC-SHA256` header containing the sha256 hmac hash of the plain text secret.
+  # If the header exists and no webhookSecret is defined here, the bot will ignore the request, because it cannot be
+  # validated.
+  webhook:
+    secret: "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['GITEA_SONARQUBE_BOT_SQUBE_WEBHOOK_SECRET'] }}"
+    # # or path to file containing the plain text secret
+    # secretFile: /path/to/sonarqube/webhook/secret
+
+  # Some useful metrics depend on the edition in use. There are various ones like code_smells, vulnerabilities, bugs, etc.
+  # By default, the bot will extract "bugs,vulnerabilities,code_smells"
+  # Setting this option you can extend that default list by your own metrics.
+  # additionalMetrics: []
+  # - "new_security_hotspots"
+
+# List of project mappings to take care of. Webhooks for other projects will be ignored.
+# At least one must be configured. Otherwise, all webhooks (no matter which source) because the bot cannot map on its own.
+projects:
+  - sonarqube:
+      key: rinoa-docker
+    # A repository specification contains the owner name and the repository name itself. The owner can be the name of a
+    # real account or an organization in which the repository is located.
+    gitea:
+      owner: Trez.One
+      name: rinoa-docker
+
+# Define pull request names from SonarScanner analysis. Default pattern matches the Jenkins Gitea plugin schema.
+namingPattern:
+  # Regular expression that MUST HAVE exactly ONE GROUP that matches the integer part of the PR.
+  # That integer part is identical to the pull request ID in Gitea.
+  regex: "^.*$"
+
+  # Valid Go format string. It MUST have one integer placeholder which will be replaced by the pull request ID.
+  # See: https://pkg.go.dev/fmt#hdr-Printing
+  template: "%s"
+
+  # Example for integer-only names
+  # # regex: "^(\\d+)$"
+  # # template: "%d"

From e6f5768d296adc7e7549711568c1cbc2b3c374ee Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Mon, 20 Jan 2025 08:31:36 -0500
Subject: [PATCH 71/75] ...

---
 .../workflows/pr-cloudflare-docker-deploy.yml |  1 -
 .../gitea-sonarqube-bot_config.yaml.j2        | 81 -------------------
 2 files changed, 82 deletions(-)
 delete mode 100644 ansible/app-configs/gitea-sonarqube-bot_config.yaml.j2

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 8954738c..d7da3203 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -5,7 +5,6 @@ on:
       - main
     paths:
       - '**.yml'
-
 jobs:
   check-and-create-pr:
     name: Check and Create PR
diff --git a/ansible/app-configs/gitea-sonarqube-bot_config.yaml.j2 b/ansible/app-configs/gitea-sonarqube-bot_config.yaml.j2
deleted file mode 100644
index 90b9fb69..00000000
--- a/ansible/app-configs/gitea-sonarqube-bot_config.yaml.j2
+++ /dev/null
@@ -1,81 +0,0 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
-
-# Gitea related configuration. Necessary for adding/updating comments on repository pull requests
-gitea:
-  # Endpoint of your Gitea instance. Must be expandable by '/api/v1' to form the API base path as shown in Swagger UI.
-  url: https://git.trez.wtf
-
-  # Created access token for the user that shall be used as bot account.
-  # User needs "Read project" permissions with access to "Pull Requests"
-  token:
-    value: "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['GITEA_SONARQUBE_BOT_GITEA_TOKEN'] }}"
-    # # or path to file containing the plain text secret
-    # file: /path/to/gitea/token
-
-  # If the sent webhook has a signature header, the bot validates the request payload. If the value does not match, the
-  # request will be ignored.
-  # The bot looks for `X-Gitea-Signature` header containing the sha256 hmac hash of the plain text secret. If the header
-  # exists and no webhookSecret is defined here, the bot will ignore the request, because it cannot be validated.
-  webhook:
-    secret: "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['GITEA_SONARQUBE_BOT_GITEA_WEBHOOK_SECRET'] }}"
-    # # or path to file containing the plain text secret
-    # secretFile: /path/to/gitea/webhook/secret
-
-  # Pull Request status check settings.
-  statusCheck:
-    # Configure the label/name of the PR status check.
-    name: "gitea-sonarqube-bot"
-
-# SonarQube related configuration. Necessary for requesting data from the API and processing the webhook.
-sonarqube:
-  # Endpoint of your SonarQube instance. Must be expandable by '/api' to form the API base path.
-  url: https://sqube.trez.wtf
-
-  # Created access token for the user that shall be used as bot account.
-  # User needs "Browse on project" permissions
-  token:
-    value: "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['GITEA_SONARQUBE_BOT_SQUBE_TOKEN'] }}"
-    # # or path to file containing the plain text secret
-    # file: /path/to/sonarqube/token
-
-  # If the sent webhook has a signature header, the bot validates the request payload. If the value does not match, the
-  # request will be ignored.
-  # The bot looks for `X-Sonar-Webhook-HMAC-SHA256` header containing the sha256 hmac hash of the plain text secret.
-  # If the header exists and no webhookSecret is defined here, the bot will ignore the request, because it cannot be
-  # validated.
-  webhook:
-    secret: "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['GITEA_SONARQUBE_BOT_SQUBE_WEBHOOK_SECRET'] }}"
-    # # or path to file containing the plain text secret
-    # secretFile: /path/to/sonarqube/webhook/secret
-
-  # Some useful metrics depend on the edition in use. There are various ones like code_smells, vulnerabilities, bugs, etc.
-  # By default, the bot will extract "bugs,vulnerabilities,code_smells"
-  # Setting this option you can extend that default list by your own metrics.
-  # additionalMetrics: []
-  # - "new_security_hotspots"
-
-# List of project mappings to take care of. Webhooks for other projects will be ignored.
-# At least one must be configured. Otherwise, all webhooks (no matter which source) because the bot cannot map on its own.
-projects:
-  - sonarqube:
-      key: rinoa-docker
-    # A repository specification contains the owner name and the repository name itself. The owner can be the name of a
-    # real account or an organization in which the repository is located.
-    gitea:
-      owner: Trez.One
-      name: rinoa-docker
-
-# Define pull request names from SonarScanner analysis. Default pattern matches the Jenkins Gitea plugin schema.
-namingPattern:
-  # Regular expression that MUST HAVE exactly ONE GROUP that matches the integer part of the PR.
-  # That integer part is identical to the pull request ID in Gitea.
-  regex: "^.*$"
-
-  # Valid Go format string. It MUST have one integer placeholder which will be replaced by the pull request ID.
-  # See: https://pkg.go.dev/fmt#hdr-Printing
-  template: "%s"
-
-  # Example for integer-only names
-  # # regex: "^(\\d+)$"
-  # # template: "%d"

From d509eff13fc0f59fbba1579798ed93e654405900 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Mon, 20 Jan 2025 08:39:56 -0500
Subject: [PATCH 72/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index d7da3203..33d84c91 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -73,7 +73,6 @@ jobs:
           key: ${{secrets.RINOA_ANSIBLE_PRIVATE_KEY}}
           options: |
             --inventory inventory/hosts.yml
-            --diff
             --check
           requirements: collections/requirements.yml
           vault_password: ${{ secrets.ANSIBLE_VAULT_PASSWORD }}
@@ -199,6 +198,7 @@ jobs:
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           echo "Setting default login for Gitea..."
           tea login default gitea-rinoa
+          echo "Merging PR..."
           pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g')
           echo "${pr_index}"
           tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" --output table ${pr_index}

From 0e7054ac2fde87be634d904f415f85210db75268 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Mon, 20 Jan 2025 09:35:40 -0500
Subject: [PATCH 73/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 33d84c91..dc8b62ce 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -199,9 +199,9 @@ jobs:
           echo "Setting default login for Gitea..."
           tea login default gitea-rinoa
           echo "Merging PR..."
-          pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g')
+          pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F"," '{print $1}' | sed -e 's|"||g')
           echo "${pr_index}"
-          tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" --output table ${pr_index}
+          tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" ${pr_index}
   ansible-config-docker-compose-deploy:
     name: Deploy via Ansible & Docker Compose
     runs-on: ubuntu-latest

From b16f96b3761d52cd141059622ed6b7aa4f21ffd5 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Mon, 20 Jan 2025 09:44:35 -0500
Subject: [PATCH 74/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index dc8b62ce..a688a213 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -201,7 +201,7 @@ jobs:
           echo "Merging PR..."
           pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F"," '{print $1}' | sed -e 's|"||g')
           echo "${pr_index}"
-          tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR #${pr_index} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" ${pr_index}
+          tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR ${pr_index} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" ${pr_index}
   ansible-config-docker-compose-deploy:
     name: Deploy via Ansible & Docker Compose
     runs-on: ubuntu-latest

From 35e57799a43ce09fb8d77173950788a894dfce9a Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Mon, 20 Jan 2025 09:56:07 -0500
Subject: [PATCH 75/75] ...

---
 .gitea/workflows/pr-cloudflare-docker-deploy.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index a688a213..fbd3c86b 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -196,11 +196,9 @@ jobs:
         id: pr_merge
         run: |
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
-          echo "Setting default login for Gitea..."
           tea login default gitea-rinoa
           echo "Merging PR..."
           pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F"," '{print $1}' | sed -e 's|"||g')
-          echo "${pr_index}"
           tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR ${pr_index} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" ${pr_index}
   ansible-config-docker-compose-deploy:
     name: Deploy via Ansible & Docker Compose
@@ -253,5 +251,5 @@ jobs:
         with:
           gotify_api_base: '${{ secrets.gotify_api_base }}'
           gotify_app_token: '${{ secrets.gotify_app_token }}'
-          notification_title: 'Docker ComposeDeployment @ Rinoa'
+          notification_title: 'Docker Compose Deployment @ Rinoa'
           notification_message: 'Deployment completed successfully.'
\ No newline at end of file