Adding PlantUML server for Gitea.

Merged by Trez.One

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

@@ -15,7 +15,8 @@ jobs:
         with:
           fetch-depth: 1
       - name: Cache tea CLI
-        uses: actions/cache@v3
+        id: cache-tea
+        uses: actions/cache@v4
         with:
           path: /opt/hostedtoolcache/tea/0.9.2/x64
           key: tea-${{ runner.os }}-0.9.2
@@ -29,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 default gitea-rinoa
+          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 }}
           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')'
+          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]
@@ -80,7 +81,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') }}
@@ -104,7 +105,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') }}
@@ -115,7 +116,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
@@ -204,7 +205,6 @@ jobs:
     name: Deploy via Ansible & Docker Compose
     runs-on: ubuntu-latest
     needs: [pr-merge]
-    if: ${{ github.event.pull_request.merged == true }
     env:
       VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }}
       VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
@@ -214,6 +214,16 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: main
+      - 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 Ansible
+        uses: alex-oleshkevich/setup-ansible@v1.0.1
+        with:
+          version: "11.0.0"
       - name: Install Vault
         uses: cpanato/vault-installer@main
       - name: Install hvac
@@ -231,8 +241,8 @@ jobs:
       - name: Gotify Notification
         uses: eikendev/gotify-action@master
         with:
-          gotify_api_base: '${{ secrets.gotify_api_base }}'
-          gotify_app_token: '${{ secrets.gotify_app_token }}'
+          gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}'
+          gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}'
           notification_title: 'Ansible Config Deployment @ Rinoa'
           notification_message: 'Deployment completed successfully.'
       - name: Generate .env file for deployment
@@ -249,7 +259,7 @@ jobs:
       - name: Gotify Notification
         uses: eikendev/gotify-action@master
         with:
-          gotify_api_base: '${{ secrets.gotify_api_base }}'
-          gotify_app_token: '${{ secrets.gotify_app_token }}'
+          gotify_api_base: '${{ secrets.RINOA_GOTIFY_URL }}'
+          gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}'
           notification_title: 'Docker Compose Deployment @ Rinoa'
           notification_message: 'Deployment completed successfully.'

README.md

@@ -67,7 +67,6 @@
 | jitsi-web | jitsi/web:stable |
 | joplin-db | postgres:17-alpine |
 | joplin | joplin/server:latest |
-| librespeed | lscr.io/linuxserver/librespeed:latest |
 | lidarr | lscr.io/linuxserver/lidarr:latest |
 | lidify | thewicklowwolf/lidify:latest |
 | lldap | lldap/lldap:stable |
@@ -87,6 +86,8 @@
 | ollama | ollama/ollama |
 | ombi | lscr.io/linuxserver/ombi:latest |
 | paperless-ngx | ghcr.io/paperless-ngx/paperless-ngx:latest |
+| pgbackweb | eduardolat/pgbackweb:latest |
+| pgbackweb-db | postgres:16-alpine |
 | plausible | ghcr.io/plausible/community-edition:v2.1.0 |
 | plausible_db | postgres:16-alpine |
 | plausible_events_db | clickhouse/clickhouse-server:24.3.3.102-alpine |
@@ -101,14 +102,11 @@
 | readarr | lscr.io/linuxserver/readarr:develop |
 | redis | redis:alpine |
 | redlib | quay.io/redlib/redlib:latest |
-| rundeck | rundeck/rundeck:5.8.0 |
-| rundeck-pg-db | postgres:16-alpine |
 | sabnzbdvpn | ghcr.io/binhex/arch-sabnzbdvpn:latest |
 | scraperr | jpyles0524/scraperr:latest |
 | scraperr-api | jpyles0524/scraperr_api:latest |
 | scrutiny | ghcr.io/analogj/scrutiny:master-omnibus |
 | searxng | searxng/searxng:latest |
-| semaphore | semaphoreui/semaphore:v2.10.32 |
 | slurpit-portal | slurpit/portal:latest |
 | slurpit-scanner | slurpit/scanner:latest |
 | slurpit-scraper | slurpit/scraper:latest |
@@ -119,6 +117,7 @@
 | sonashow | thewicklowwolf/sonashow:latest |
 | soularr | mrusse08/soularr:latest |
 | soulseek | slskd/slskd |
+| speedtest-tracker | lscr.io/linuxserver/speedtest-tracker:latest |
 | spotisub | blastbeng/spotisub:latest |
 | swag | lscr.io/linuxserver/swag:latest |
 | synapse | docker.io/matrixdotorg/synapse:latest |

docker-compose.yml

@@ -2685,57 +2685,6 @@ services:
         published: "22300"
         target: 22300
     restart: unless-stopped
-  librespeed:
-    container_name: librespeed
-    environment:
-      DB_HOSTNAME: 
-      DB_NAME: 
-      DB_PASSWORD: 
-      DB_TYPE: sqlite
-      DB_USERNAME: 
-      PASSWORD: 
-      PGID: 1000
-      PUID: 1000
-      TZ: America/New_York
-      DOCKER_MODS: ghcr.io/themepark-dev/theme.park:librespeed
-    hostname: Rinoa
-    image: lscr.io/linuxserver/librespeed:latest
-    labels:
-      homepage.group: System Administration
-      homepage.name: LibreSpeed
-      homepage.href: https://speed.${MY_TLD}
-      homepage.icon: librespeed.png
-      homepage.description: Speed test
-      homepage: enable
-      homepage_proto: http
-      homepage_url: speed.${MY_TLD}
-      homepage.uptime-kuma.enabled: true
-      homepage.uptime-kuma.monitor.url: https://speed.${MY_TLD}
-    networks:
-      default: null
-    ports:
-      - mode: ingress
-        protocol: tcp
-        published: "8014"
-        target: 80
-    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}/librespeed
-        target: /config
-        type: bind
-      - bind:
-          create_host_path: true
-        source: /rinoa-storage
-        target: /storage
-        type: bind
   lidarr:
     container_name: lidarr
     environment:
@@ -3484,6 +3433,50 @@ services:
         type: bind
         bind:
           create_host_path: true
+  pgbackweb:
+    container_name: pgbackweb
+    depends_on:
+      pgbackweb-db:
+        condition: service_healthy
+    environment:
+      PBW_ENCRYPTION_KEY: ${PGBACKWEB_ENCRYPTION_KEY}
+      PBW_POSTGRES_CONN_STRING: "postgresql://pgbackweb:${PGBACKWEB_PG_DB_PASSWD}@pgbackweb-db:5432/pgbackweb?sslmode=disable"
+      TZ: ${TZ}
+    image: eduardolat/pgbackweb:latest
+    labels:
+      homepage.group: System Administration
+      homepage.name: PGBackweb
+      homepage.href: https://pg.${MY_TLD}
+      homepage.icon: sh-pg-back-web.svg
+      homepage.description: Backups for PostgreSQL
+      swag: enable
+      swag_proto: http
+      swag_port: 8085
+      swag_url: pg.${MY_TLD}
+    ports:
+      - "8085:8085" # Access the web interface at http://localhost:8085
+  pgbackweb-db:
+    container_name: pgbackweb-db
+    environment:
+      POSTGRES_USER: pgbackweb
+      POSTGRES_DB: pgbackweb
+      POSTGRES_PASSWORD: ${PGBACKWEB_PG_DB_PASSWD}
+    expose:
+      - 5432
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    image: postgres:16-alpine
+    volumes:
+      - pgbackweb-data:/var/lib/postgresql/data
+  plantuml-server:
+    container_name: plantuml-server
+    expose:
+      - 8080
+    image: 'plantuml/plantuml-server:jetty'
+    restart: unless-stopped
   plausible:
     command: sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"
     container_name: plausible
@@ -3954,52 +3947,6 @@ services:
     security_opt:
       - no-new-privileges=true
     user: nobody
-  rundeck:
-    container_name: rundeck
-    depends_on:
-      rundeck-pg-db:
-        condition: service_started
-        required: true
-    image: rundeck/rundeck:5.8.0
-    environment:
-      RUNDECK_SERVER_ADDRESS: 0.0.0.0
-      RUNDECK_GRAILS_URL: https://rundeck.trez.wtf
-      RUNDECK_SERVER_FORWARDED: true
-      RUNDECK_DATABASE_DRIVER: jdbc:postgresql://rundeck-pg-db/rundeck?autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true
-      RUNDECK_DATABASE_USERNAME: rundeck
-      RUNDECK_DATABASE_PASSWORD: ${RUNDECK_PG_DB_PASSWD}
-      RUNDECK_MAIL_SMTP_HOST: postal-smtp
-      RUNDECK_MAIL_SMTP_PORT: 25
-      RUNDECK_MAIL_SMTP_USERNAME: ${POSTAL_SMTP_AUTH_USER}
-      RUNDECK_MAIL_SMTP_PASSWORD: ${POSTAL_SMTP_AUTH_PASSWORD}
-      RUNDECK_MAIL_FROM: noreply@trez.wtf
-    labels:
-      homepage.group: Code/DevOps
-      homepage.name: Rundeck
-      homepage.icon: rundeck.svg
-      homepage.description: Open-source automation service with a web console, command line tools, and web API
-      swag: enable
-      swag_proto: http
-      swag_port: 4440
-      swag_url: rundeck.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://rundeck.${MY_TLD}
-    ports:
-      - 4440:4440
-    restart: unless-stopped
-    volumes:
-      - rundeck-data:/home/rundeck/server/data
-  rundeck-pg-db:
-    container_name: rundeck-pg-db
-    image: postgres:16-alpine
-    expose:
-      - 5432
-    environment:
-      POSTGRES_DB: rundeck
-      POSTGRES_USER: rundeck
-      POSTGRES_PASSWORD: ${RUNDECK_PG_DB_PASSWD}
-    volumes:
-      - rundeck-db-data:/var/lib/postgresql/data
   sabnzbdvpn:
     cap_add:
       - NET_ADMIN
@@ -4215,43 +4162,6 @@ services:
         type: bind
         bind:
           create_host_path: true
-  semaphore:
-    container_name: semaphore
-    environment:
-      ANSIBLE_HOST_KEY_CHECKING: false
-      SEMAPHORE_ADMIN_PASSWORD: ${SEMAPHORE_ADMIN_PASSWORD}
-      SEMAPHORE_ADMIN_NAME: admin
-      SEMAPHORE_ADMIN_EMAIL: charish.patel@pm.me
-      SEMAPHORE_ADMIN: admin
-      SEMAPHORE_DB_DIALECT: bolt
-      SEMAPHORE_EMAIL_ALERT: true
-      SEMAPHORE_EMAIL_SENDER: noreply@trez.wtf
-      SEMAPHORE_EMAIL_HOST: postal-smtp
-      SEMAPHORE_EMAIL_PORT: 25
-      SEMAPHORE_EMAIL_USERNAME: ${POSTAL_SMTP_AUTH_USER}  
-      SEMAPHORE_EMAIL_PASSWORD: ${POSTAL_SMTP_AUTH_PASSWORD}
-      SEMAPHORE_EMAIL_SECURE: false
-      SEMAPHORE_USE_REMOTE_RUNNER: true
-    image: semaphoreui/semaphore:v2.10.32
-    labels:
-      homepage.group: Code/DevOps
-      homepage.name: Semaphore
-      homepage.href: https://devops.${MY_TLD}
-      homepage.icon: semaphore.svg
-      homepage.description: Modern UI for Ansible, Terraform, OpenTofu, PowerShell and other DevOps tools
-      swag: enable
-      swag_port: 3000
-      swag_proto: http
-      swag_url: devops.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://devops.${MY_TLD}
-    ports:
-      - 3015:3000
-    restart: unless-stopped
-    volumes:
-      - semaphore_config:/etc/semaphore
-      - semaphore_data:/var/lib/semaphore
-      - semaphore_tmp:/tmp/semaphore
   slurpit-portal:
     container_name: slurpit-portal
     environment:
@@ -4542,6 +4452,31 @@ services:
         type: bind
         bind:
           create_host_path: true
+  speedtest-tracker:
+    container_name: speedtest-tracker
+    image: lscr.io/linuxserver/speedtest-tracker:latest
+    environment:
+        PUID: ${PUID}
+        PGID: ${PGID}
+        APP_KEY: ${SPEEDTEST_TRACKER_APP_KEY}
+        DB_CONNECTION: sqlite
+    labels:
+      homepage.name: Speedtest Traccker
+      homepage.group: System Administration
+      homepage.description: Self-hosted internet performance tracking
+      homepage.href: https://speed.${MY_TLD}
+      homepage.icon: speedtest-tracker.png
+      swag: enable
+      swag_proto: http
+      swag_url: speed.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://slsk.${MY_TLD}
+    ports:
+        - 47512:80
+        - 62777:443
+    restart: unless-stopped
+    volumes:
+        - ${DOCKER_VOLUME_CONFIG}/speedtest-tracker:/config
   spotisub:
     container_name: spotisub
     environment:
@@ -4697,7 +4632,7 @@ services:
       homepage.group: Lifestyle
       homepage.name: Tandoor Recipes
       homepage.href: https://recipes.${MY_TLD}
-      homepage.icon: tandoor.svg
+      homepage.icon: tandoor-recipes.svg
       homepage.description: Recipes, cookbooks, meal-planning, & grocery lists
       homepage.widget.type: tandoor
       homepage.widget.url: http://tandoor-recipes:8080
@@ -7148,6 +7083,8 @@ volumes:
     name: paperless-ngx-media
   paperless-ngx-pg:
     name: paperless-ngx-pg
+  pgbackweb-data:
+    name: pgbackweb-data
   plausible-db-data:
     name: plausible-db-data
   plausible-event-data:
@@ -7156,16 +7093,6 @@ volumes:
     name: plausible-event-logs
   reactive-resume-pg:
     name: reactive-resume-pg
-  rundeck-data:
-    name: rundeck-data
-  rundeck-db-data:
-    name: rundeck-db-data
-  semaphore_config:
-    name: semaphore_config
-  semaphore_data:
-    name: semaphore_data
-  semaphore_tmp:
-    name: semaphore_tmp
   sonarqube-data:
     name: sonarqube-data
   sonarqube-db: