Hopefully the final version.

.gitea/workflows/deployment.yml

@@ -30,11 +30,11 @@ jobs:
         with:
           url: ${{ gitea.server_url }}
           token: ${{ secrets.BOT_GITEA_TOKEN }}
-          assignee: ${{ gitea.actor }}
+          pr-label: 'auto-deploy-pr'
 
   docker-compose-test:
     name: Docker Compose Test
-    needs: [create-pr]
+    needs: [check-and-create-pr]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -56,10 +56,64 @@ jobs:
         env:
           DOCKER_HOST: tcp://dockerproxy:2375
 
+  cloudflare-dns-setup:
+    name: Cloudflare DNS Setup
+    needs: [docker-compose-test]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install jq
+        uses: dcarbone/install-jq-action@v3.0.1
+
+      - name: Install yq
+        uses: dcarbone/install-yq-action@v1
+      
+      - name: Install flarectl
+        uses: supplypike/setup-bin@v4
+        with:
+          uri: 'https://github.com/cloudflare/cloudflare-go/releases/download/v0.113.0/flarectl_0.113.0_linux_amd64.tar.gz'
+          name: 'flarectl'
+          version: '0.113.0'
+
+      - name: Grab Subdomains from Docker Compose & Cloudflare
+        id: grab-subdomains
+        env:
+          CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
+          CF_API_EMAIL: ${{ secrets.CF_API_EMAIL }}
+        run: |
+          echo "Grabbing subdomains from docker-compose.yml..."
+          yq '.services[].labels.swag_url' docker-compose.yml | egrep -v 'null' | sed -e 's|"||g' | awk -F'.' '{print $1}' | sort > compose_subdomains.txt
+          echo "Grabbing subdomains from Cloudflare..."
+          flarectl --json dns list --zone "trez.wtf" --type=CNAME --content "trez.wtf" | jq '.[].Name' | sed -e 's|"||g' | awk -F"." '{print $1}' | sort > cloudflare_subdomains.txt
+          
+      - name: Compare Subdomains
+        id: compare-subdomains
+        uses: LouisBrunner/diff-action@v2.2.0
+        with:
+          old: compose_subdomains.txt
+          new: cloudflare_subdomains.txt
+          mode: addition
+          tolerance: mixed-better
+          output: domain_compare.txt
+
+      - name: Create Subdomains
+        if: steps.compare-subdomains.outputs.output != ''
+        env:
+          CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
+          CF_API_EMAIL: ${{ secrets.CF_API_EMAIL }}
+        run: |
+          cat domain_compare.txt | egrep '^-[a-z]' | sed -e 's|-||g' | while read -r subdomain; do
+            echo "Creating $subdomain.trez.wtf..."
+            flarectl dns create --zone "trez.wtf" --name "${subdomain}" --type=CNAME --content "trez.wtf"
+          done
+
   merge-pr:
     name: PR Merge
     runs-on: ubuntu-latest
-    needs: [docker-compose-test]
+    if: ${{ always() }}
+    needs: [cloudflare-dns-setup]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -70,6 +124,5 @@ jobs:
           chmod +x /usr/local/bin/tea
           echo "Merging PR..."
           tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
-          echo ${{ gitea.ref_name }}
           pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g')
-          tea pr m --repo ${{ github.repository }} --title "${{ github.ref_name }} Auto Merge" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index}
+          tea pr m --repo ${{ github.repository }} --title "Auto Merge of ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index}

README.md

@@ -1,8 +1,6 @@
 # List of Services
 
-```json
-~> yq '.services | to_entries | map({service: .key, image: .value.image})' docker-compose.yml
-
+```
 [
   {
     "service": "actual_server",

docker-compose.yml

@@ -342,7 +342,7 @@ services:
       homepage.group: Downloaders
       homepage.name: Bitmagnet
       homepage.href: https://btmag.${MY_TLD}
-      homepage.icon: sh-bitmagnet.png
+      homepage.icon: /icons/bitmagnet.svg
       homepage.description: Torrent indexer, DHT crawler, search engine, & content classifier
       homepage.widget.type: gluetun
       homepage.widget.url: http://gluetun:8000
@@ -691,7 +691,7 @@ services:
       homepage.group: System Administration
       homepage.name: Czkawka
       homepage.href: https://czkawka.${MY_TLD}
-      homepage.icon: sh-czkawka.png
+      homepage.icon: /icons/czkawka.png
       homepage.description: Smart file management
       swag: enable
       swag_port: 5800
@@ -744,7 +744,7 @@ services:
       homepage.group: System Administration
       homepage.name: Dagu
       homepage.href: https://cron.${MY_TLD}
-      homepage.icon: sh-dagu.png
+      homepage.icon: /icons/dagu.png
       homepage.description: Cron alternative using DAGs (Directed Acyclic Graphs)
       swag: enable
       swag_port: 8080
@@ -983,7 +983,7 @@ services:
     labels:
       homepage.group: Lifestyle
       homepage.name: Fasten
-      homepage.icon: sh-fasten-health.svg
+      homepage.icon: /icons/fastenhealth.png
       homepage.href: http://health.${MY_TLD}
       homepage.description: Open-source, self-hosted, personal/family electronic medical record aggregator
       swag: enable
@@ -1187,7 +1187,7 @@ services:
       homepage.description: Private Code Gists
       homepage.group: Code/DevOps
       homepage.href: https://gist.trez.wtf
-      homepage.icon: sh-opengist.svg
+      homepage.icon: /icons/opengist.svg
       homepage.name: Opengist
       swag: enable
       swag.uptime-kuma.enabled: "true"
@@ -1398,7 +1398,7 @@ services:
       homepage.name: Grafana Alloy
       homepage.description: Agent for metric/log/trace/profile collection and writing
       homepage.href: http://192.168.1.254:12345
-      homepage.icon: sh-grafana-alloy.svg
+      homepage.icon: /icons/grafana-alloy.svg
     networks:
       default: null
     ports:
@@ -1590,31 +1590,6 @@ services:
         type: bind
         bind:
           create_host_path: true
-  guacamole:
-    container_name: guacamole
-    environment:
-      DOCKER_HOST: tcp://dockerproxy:2375
-      EXTENSIONS: 'auth-totp'
-      TZ: ${TZ}
-    image: flcontainers/guacamole:latest
-    labels:
-      homepage.group: System Administration
-      homepage.name: Guacamole
-      homepage.description: Client-less remote desktop gateway
-      homepage.href: https://guac.trez.wtf
-      homepage.icon: guacamole.svg
-      swag: enable
-      swag_proto: http
-      swag_port: 8080
-      swag_url: guac.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://guac.${MY_TLD}
-    ports:
-      - 62173:8080
-    restart: always
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/guacamole/:/config
-      - /etc/localtime:/etc/localtime:ro
   homepage:
     container_name: homepage
     image: ghcr.io/gethomepage/homepage:latest
@@ -2813,7 +2788,7 @@ services:
       homepage.group: Servarr Stack
       homepage.name: Lidify
       homepage.href: https://lidify.${MY_TLD}
-      homepage.icon: sh-lidify.png
+      homepage.icon: /icons/lidify.png
       homepage.description: Music Discovery a la Last.fm, Spotify, Pandora, etc.
       swag: enable
       swag_auth: authelia
@@ -3078,6 +3053,29 @@ services:
     restart: always
     volumes:
       - mastodon-pg-db:/var/lib/postgresql/data    
+  meshcentral:
+    container_name: meshcentral
+    image: ghcr.io/ylianst/meshcentral:master
+    labels:
+      homepage.group: System Administration
+      homepage.name: MeshCentral
+      homepage.href: https://mesh.${MY_TLD}
+      homepage.icon: meshcentral.png
+      homepage.description: 
+      swag: enable
+      swag_proto: http
+      swag_port: 80
+      swag_url: mesh.${MY_TLD}
+    ports:
+      - 46717:80 # HTTP
+      - 61741:443 # HTTPS
+      - 42865:4433 # AMT (Optional)
+    restart: unless-stopped
+    volumes:
+      - meshcentral-data:/opt/meshcentral/meshcentral-data
+      - meshcentral-user_files:/opt/meshcentral/meshcentral-files
+      - meshcentral-backup:/opt/meshcentral/meshcentral-backups
+      - meshcentral-web:/opt/meshcentral/meshcentral-web
   minio:
     command: server --console-address ":9090" /mnt/data
     container_name: minio
@@ -3151,7 +3149,7 @@ services:
       homepage.group: Media Library
       homepage.name: Multi-Scrobbler
       homepage.href: http://192.168.1.254:9078
-      homepage.icon: sh-multi-scrobbler.svg
+      homepage.icon: /icons/multi-scrobbler.png
       homepage.description: JS App for scrobbling/recording play history from/to multiple sources
     networks:
       default: null
@@ -3590,7 +3588,7 @@ services:
       homepage.group: System Administration
       homepage.name: Postal
       homepage.href: https://post.${MY_TLD}
-      homepage.icon: sh-postal.svg
+      homepage.icon: /icons/postal.png
       homepage.description: OSS Mail delivery platform
     networks:
       default: null
@@ -3694,7 +3692,7 @@ services:
       homepage.group: Servarr Stack
       homepage.name: RadaRec
       homepage.href: https://radarec.${MY_TLD}
-      homepage.icon: sh-radarec.png
+      homepage.icon: /icons/radarec.png
       homepage.description: Movie discovery based on library/tastes
       swag: enable
       swag_proto: http
@@ -4405,7 +4403,7 @@ services:
       homepage.group: Servarr Stack
       homepage.name: Sonashow
       homepage.href: https://sonashow.${MY_TLD}
-      homepage.icon: sh-sonashow.png
+      homepage.icon: /icons/sonashow.png
       homepage.description: TV show discovery based on library/tastes
       swag: enable
       swag_auth: authelia
@@ -4452,7 +4450,7 @@ services:
       homepage.group: Downloaders
       homepage.description: Modern client-server application for the Soulseek file-sharing network.
       homepage.href: https://slsk.${MY_TLD}
-      homepage.icon: sh-slskd.svg
+      homepage.icon: /icons/slskd.png
       swag: enable
       swag_proto: http
       swag_url: slsk.${MY_TLD}
@@ -6481,7 +6479,7 @@ services:
       homepage.group: System Administration
       homepage.name: WhoDB
       homepage.href: https://dbs.${MY_TLD}
-      homepage.icon: sh-whodb.png
+      homepage.icon: /icons/whodb.png
       homepage.description: Web-based DB management
       swag: enable
       swag_proto: http