.forgejo/workflows/CD.yml

@@ -24,9 +24,28 @@ jobs:
           echo "Modified folders: $folders"
           echo "::set-output name=folders::$folders"
 
+      - name: Set condition for deployment
+        id: set-condition
+        run: |
+          if [ -z "${{ steps.detect-changes.outputs.folders }}" ]; then
+            echo "No relevant changes detected."
+            echo "::set-output name=continue::false"
+          else
+            echo "Relevant changes detected."
+            echo "::set-output name=continue::true"
+          fi
+
+  conditional-deploy:
+    if: needs.deploy.outputs.continue == 'true'
+    runs-on: docker
+    needs: deploy
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Deploy to hosts
         run: |
-          IFS=' ' read -r -a folder_array <<< "${{ steps.detect-changes.outputs.folders }}"
+          IFS=' ' read -r -a folder_array <<< "${{ needs.deploy.outputs.folders }}"
           for folder in "${folder_array[@]}"; do
             case $folder in
               arrs)
@@ -83,12 +102,15 @@ jobs:
               -d "{\"extra_vars\": {\"target_host\": \"$target_host\", \"folder\": \"$folder\"}}" \
               "https://awx.mafyuh.xyz/api/v2/job_templates/13/launch/"
 
-            sleep 45  # Delay for 45 seconds before fetching logs
+            sleep 45  
-
-            job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" "https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id" | grep -oP '"id":\s*\K[0-9]+')
-            logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" "https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json")
             
+            job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id | jq -r '.results[0].id')
+            logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json)
             echo "AWX Job Logs for folder: $folder"
+            echo "Range:"
+            echo "Start: $(echo "$logs" | jq -r '.range.start')"
+            echo "End: $(echo "$logs" | jq -r '.range.end')"
+            echo "Absolute End: $(echo "$logs" | jq -r '.range.absolute_end')"
             echo "Content:"
-            echo "$logs" | grep -oP '"content":\s*"\K[^"]+' | sed 's/\\n/\n/g'
+            echo "$(echo "$logs" | jq -r '.content')"
           done

README.md

@@ -1,10 +1,2 @@
 # iac
-Currently migrating [Auto-Homelab](https://git.mafyuh.dev/mafyuh/Auto-Homelab), [Iac-Homelab](https://git.mafyuh.dev/mafyuh/IaC-Homelab), [ansible-playbooks](https://git.mafyuh.dev/mafyuh/ansible-playbooks) and [kub](https://git.mafyuh.dev/mafyuh/kub) repos into this one.
-
-ToDo
-- [ ] Update Readme
-- [ ] Migrate all containers to use this repo (DB migrations)
-- [x] Get OpenTofu migrated to this repo
-- [ ] Get Kubernetes repo migrated over
-- [ ] Re-bootstrap Flux
 

ansible/playbooks/deploy-docker.yml

@@ -1,33 +0,0 @@
----
-- name: Deploy application
-  hosts: "{{ target_host }}"
-  vars:
-    repo_path: "/home/{{ ansible_user }}/iac/docker/{{ folder }}"
-  tasks:
-    - name: Ensure the repository is up-to-date
-      shell: git pull
-      args:
-        chdir: "{{ repo_path }}"
-      register: git_pull_output
-
-    - name: Display git pull output
-      debug:
-        var: git_pull_output.stdout_lines
-
-    - name: Restart services
-      command: docker compose up -d
-      args:
-        chdir: "{{ repo_path }}"
-      register: docker_compose_output
-
-    - name: Display docker output
-      debug:
-        var: docker_compose_output.stdout_lines
-    
-    - name: Run Docker Command
-      command: docker ps
-      register: docker_output
-
-    - name: Display Docker Output
-      debug:
-        var: docker_output.stdout_lines

docker/arrs/docker-compose.yml

@@ -31,7 +31,7 @@ services:
       - PGID=1000
 
   prowlarr:
-    image: ghcr.io/linuxserver/prowlarr@sha256:9a98da4fb506278ce92c2fdbb4e08a38418dd1456e3dd8b3a1f00a42a8ec4fb0
+    image: ghcr.io/linuxserver/prowlarr@sha256:7c3e7840c726828643131583514b66f38e7af29021d5a7b05ed8ed5c8ec0b596
     container_name: prowlarr
     ports:
       - "9696:9696"
@@ -91,7 +91,7 @@ services:
       - AUTH_OIDC_ADMIN_GROUP=${AUTH_OIDC_ADMIN_GROUP}
 
   doplarr:
-    image: ghcr.io/linuxserver/doplarr@sha256:9e1cfedf824d00bb0f269bcb3836b13cdbb74747bef062f9021be6f0f63dde7a
+    image: ghcr.io/linuxserver/doplarr@sha256:b71ea85a718b4ed924f132c6a5e62ddef68a7f43ba137f4f30900067532a5d9a
     container_name: doplarr
     environment:
       - PUID=1000

docker/downloaders/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   sabnzbd:
-    image: ghcr.io/linuxserver/sabnzbd@sha256:d6a2a967d47b495c5342bc23de76d35eeb2f3ceb53c7be51885ad25f95dffe9b
+    image: ghcr.io/linuxserver/sabnzbd@sha256:31ea64a7ce1e9a5ff8187f9b7c905eaa1d0a79d49b04724e47059c67407157eb
     container_name: sabnzbd
     environment:
       - PUID=1000

terraform/README.md

@@ -3,7 +3,7 @@
 
 <div align="center">
 
-# IaC
+# IaC-Homelab
 
 Infrastructure as Code (IaC) for my homelab using OpenTofu.