Pipeline fixes.

Merged by Trez.One

.gitea/workflows/pr-cloudflare-docker-deploy.yml

@@ -185,9 +185,9 @@ jobs:
     name: Update README & Generate List of Modified Services
     runs-on: ubuntu-latest
     needs: [cloudflare-dns-setup]
-    outputs:
+    # outputs:
-      pr-pushed: ${{ steps.commit-readme.outputs.pushed }}
+    #   pr-pushed: ${{ steps.commit-readme.outputs.pushed }}
-      modified_services: ${{ steps.compare-services.outputs.modified_services }}
+    #   modified_services: ${{ steps.compare-services.outputs.modified_services }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -228,7 +228,7 @@ jobs:
           add: "README.md"
   pr-merge:
     name: PR Merge
-    needs: [regenerate-readme]
+    needs: [regenerate-readme-modified-services]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

ansible/app-configs/homepage_settings.yaml.j2

@@ -27,22 +27,22 @@ layout:
     # fiveColumns: true
   Infrastructure/App Performance Monitoring:
     style: row
-    columns: 4
+    columns: 3
+  Code/DevOps:
+    style: row
+    columns: 3
+  Social:
+    style: row
+    columns: 3
+  Lifestyle:
+    style: row
+    columns: 3
   Automation:
     style: columns
     row: 2
-  Code/DevOps:
-    style: columms
-    row: 2
   Privacy/Security:
     style: columns
     row: 5
-  Social:
-    style: columns
-    row: 4
-  Lifestyle:
-    style: row
-    columns: 4
   Personal Services:
     style: row
     columns: 4
@@ -57,4 +57,4 @@ layout:
     columns: 3
   Media Library:
     style: row
-    columns: 4
+    columns: 3

docker-compose.yml

@@ -130,45 +130,6 @@ services:
         type: bind
         bind:
           create_host_path: true
-  apprise:
-    container_name: apprise
-    environment:
-      PGID: 1000
-      PUID: 1000
-      TZ: America/New_York
-    hostname: Rinoa
-    image: lscr.io/linuxserver/apprise-api:latest
-    labels:
-      homepage.group: Infrastructure/App Performance Monitoring
-      homepage.name: Apprise
-      homepage.icon: apprise.png
-      homepage.href: http://192.168.1.254:8000
-      homepage.description: Cemtralized, multi-channel notification API
-    networks:
-      default: null
-    ports:
-      - mode: ingress
-        protocol: tcp
-        published: "8000"
-        target: 8000
-    restart: unless-stopped
-    volumes:
-      - bind:
-          create_host_path: true
-        read_only: true
-        source: /etc/localtime
-        target: /etc/localtime
-        type: bind
-      - bind:
-          create_host_path: true
-        source: ${DOCKER_VOLUME_CONFIG}/apprise
-        target: /config
-        type: bind
-      - bind:
-          create_host_path: true
-        source: /rinoa-storage
-        target: /storage
-        type: bind
   audiobookshelf:
     container_name: audiobookshelf
     environment:
@@ -340,6 +301,23 @@ services:
     extra_hosts:
       - host.docker.internal:host-gateway
     image: henrygd/beszel:latest
+    labels:
+      homepage.group: Infrastructure/App Performance Monitoring
+      homepage.name: Beszel
+      homepage.href: https://beszel.${MY_TLD}
+      homepage.icon: beszel.svg
+      homepage.description: Lightweight server monitoring hub
+      homepage.widget.type: beszel
+      homepage.widget.url: http://beszel:8090
+      homepage.widget.username: ${SWAG_ENVIRONMENT_EMAIL}
+      homepage.widget.password: ${BESZEL_ADMIN_PASSWORD}
+      homepage.widget.systemId: Rinoa
+      swag: enable
+      swag_proto: http
+      swag_port: 8090
+      swag_url: beszel.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://beszel.${MY_TLD}
     ports:
       - 22220:8090
     restart: unless-stopped
@@ -353,7 +331,9 @@ services:
       DOCKER_HOST: tcp://dockerproxy:2375
       PORT: 45876
       # Do not remove quotes around the key
-      KEY: 'UPDATE WITH YOUR PUBLIC KEY (copy from "Add system" dialog)'
+      KEY: '${BESZEL_RINOA_AGENT_KEY}'
+    expose:
+      - 45876
     image: henrygd/beszel-agent:latest
     network_mode: host
     restart: unless-stopped
@@ -402,8 +382,6 @@ services:
       swag_auth_bypass: /v1
       swag_port: 3333
       swag_url: btmag.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://btmag.${MY_TLD}
     network_mode: service:gluetun
     restart: always
     volumes:
@@ -725,7 +703,7 @@ services:
     restart: always
     volumes:
       - source: crowdsec-db
-        target: /metabase-data
+        target: /data/
         type: volume
         volume: {}
   czkawka:
@@ -825,14 +803,6 @@ services:
       PORT_joplin-db: 5432
       ENGINE_joplin-db: postgres@dbgate-plugin-postgres
 
-      LABEL_lobe-chat-pg-db: lobe-chat-pg-db
-      SERVER_lobe-chat-pg-db: lobe-chat-pg-db
-      USER_lobe-chat-pg-db: lobe
-      PASSWORD_lobe-chat-pg-db: ${GITEA_PG_DB_PASSWORD}
-      DATABASE_lobe-chat-pg-db: lobe
-      PORT_lobe-chat-pg-db: 5432
-      ENGINE_lobe-chat-pg-db: postgres@dbgate-plugin-postgres
-
       LABEL_mastodon-pg-db: mastodon-pg-db
       SERVER_mastodon-pg-db: mastodon-pg-db
       USER_mastodon-pg-db: mastodon
@@ -842,17 +812,9 @@ services:
       ENGINE_mastodon-pg-db: postgres@dbgate-plugin-postgres
 
       LABEL_mongodb: mongodb
-      URI_mongodb: mongodb://root:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017
+      URI_mongodb: mongodb://root:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/admin?replicaSet=rinoa
       ENGINE_mongodb: mongo@dbgate-plugin-mongo-v2
 
-      LABEL_netbox-db: netbox-db
-      SERVER_netbox-db: netbox-db
-      USER_netbox-db: netbox
-      PASSWORD_netbox-db: ${NETBOX_PG_DB_PASSWORD}
-      PORT_netbox-db: 5432
-      DATABASE_netbox-db: netbox
-      ENGINE_netbox-db: postgres@dbgate-plugin-postgres
-
       LABEL_pgbackweb-db: pgbackweb-db
       SERVER_pgbackweb-db: pgbackweb-db
       USER_pgbackweb-db: pgbackweb
@@ -881,13 +843,6 @@ services:
       PORT_sonarqube-pg-db: 5432
       ENGINE_sonarqube-pg-db: postgres@dbgate-plugin-postgres
 
-      LABEL_synapse-db: synapse-db
-      SERVER_synapse-db: synapse-db
-      USER_synapse-db: synapse
-      PASSWORD_synapse-db: ${SYNAPSE_POSTGRES_PASSWORD}
-      PORT_synapse-db: 5432
-      ENGINE_synapse-db: postgres@dbgate-plugin-postgres
-
       LABEL_tandoor-pg: tandoor-pg
       SERVER_tandoor-pg: tandoor-pg
       USER_tandoor-pg: tandoor
@@ -3860,6 +3815,28 @@ services:
     restart: unless-stopped
     volumes:
         - portainer-data:/data
+  portall:
+    container_name: portall
+    image: need4swede/portall:latest
+    environment:
+      SECRET_KEY: ${PORTALL_SECRET_KEY}
+    labels:
+      swag: enable
+      swag_auth: authelia
+      swag_proto: http
+      swag_port: 9000
+      swag_url: portall.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://portall.${MY_TLD}
+      homepage.group: System Administration
+      homepage.name: Portall
+      homepage.href: https://portainer.${MY_TLD}
+      homepage.icon: sh-portall.png
+      homepage.description: Management for container ports
+    ports:
+      - 8000:8080
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/portall:/app/instance
   postal-smtp:
     cap_add:
       - NET_BIND_SERVICE
@@ -4661,7 +4638,7 @@ services:
     depends_on:
       - lidarr
       - soulseek
-    environment: 
+    environment:
       PUID: ${PUID}
       PGID: ${PGID}
       TZ: ${TZ}
@@ -4750,11 +4727,13 @@ services:
       homepage.description: Self-hosted internet performance tracking
       homepage.href: https://speed.${MY_TLD}
       homepage.icon: speedtest-tracker.png
+      homepage.widget.type: speedtest
+      homepage.widget.url: http://speedtest-tracker
       swag: enable
       swag_proto: http
       swag_url: speed.${MY_TLD}
       swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://slsk.${MY_TLD}
+      swag.uptime-kuma.monitor.url: https://speed.${MY_TLD}
     ports:
         - 47512:80
         - 62777:443
@@ -4799,7 +4778,7 @@ services:
       VALIDATION: dns
       CROWDSEC_API_KEY: ${CROWDSEC_API_KEY}
       CROWDSEC_LAPI_URL: http://crowdsec:8080
-      DOCKER_MODS: linuxserver/mods:universal-docker|linuxserver/mods:swag-auto-reload|linuxserver/mods:swag-auto-proxy|linuxserver/mods:swag-dashboard|linuxserver/mods:swag-maxmind|linuxserver/mods:universal-stdout-logs|ghcr.io/linuxserver/mods:swag-crowdsec #|linuxserver/mods:swag-auto-uptime-kuma
+      DOCKER_MODS: linuxserver/mods:universal-docker|linuxserver/mods:swag-auto-reload|linuxserver/mods:swag-auto-proxy|linuxserver/mods:swag-dashboard|linuxserver/mods:swag-maxmind|linuxserver/mods:universal-stdout-logs|ghcr.io/linuxserver/mods:swag-crowdsec|linuxserver/mods:swag-auto-uptime-kuma
       PROPAGATION: 30
       UPTIME_KUMA_PASSWORD: ${UPTIME_KUMA_PASSWORD}
       UPTIME_KUMA_URL: http://uptimekuma:3001
@@ -4892,7 +4871,7 @@ services:
       swag_proto: http
       swag_url: recipes.${MY_TLD}
       swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://trac.${MY_TLD}
+      swag.uptime-kuma.monitor.url: https://recipes.${MY_TLD}
     networks:
       default: null
     ports:
@@ -6379,7 +6358,7 @@ services:
       swag_proto: http
       swag_url: subs.${MY_TLD}
       swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://trac.${MY_TLD}
+      swag.uptime-kuma.monitor.url: https://subs.${MY_TLD}
     networks:
       default: null
     ports: