Removing Librespeed, adding Speedtest-tracker.

Merged by Trez.One

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

@@ -5,7 +5,7 @@ on:
     branches-ignore:
       - main
     paths:
-      - './docker-compose.yml'
+      - '**.yml'
 
 jobs:
   check-and-create-pr:
@@ -21,7 +21,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'
-      
+
       - name: Check if open PR exists
         id: check-opened-pr-step
         continue-on-error: true
@@ -51,7 +51,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      
+
       - name: Install jq
         uses: dcarbone/install-jq-action@v3.0.1
 
@@ -88,7 +88,7 @@ jobs:
 
       - name: Install yq
         uses: dcarbone/install-yq-action@v1
-      
+
       - name: Install flarectl
         uses: supplypike/setup-bin@v4
         with:
@@ -106,7 +106,7 @@ jobs:
           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
@@ -141,7 +141,7 @@ jobs:
 
       - name: Install yq
         uses: dcarbone/install-yq-action@v1
-      
+
       - name: Generate service list
         run: |
           yq '.services | to_entries | map({"service": .key, "image": .value.image})' docker-compose.yml > services.yml
@@ -172,7 +172,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      
+
       - name: Install tea
         uses: supplypike/setup-bin@v4
         with:
@@ -184,9 +184,11 @@ 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
-          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 "Auto Merge of PR #${pr_index} - ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index}
+          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}
 
   docker-compose-deploy:
     name: Deploy via Docker Compose
@@ -211,7 +213,7 @@ jobs:
 
       - name: Docker Compose Deployment
         uses: keatonLiu/docker-compose-remote-action@v1.2
-        with: 
+        with:
           ssh_user: gitea-deploy
           ssh_host: 192.168.1.254
           ssh_host_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }}

README.md

@@ -101,6 +101,8 @@
 | 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 |

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:
@@ -3954,6 +3903,52 @@ 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
@@ -4496,6 +4491,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:
@@ -7110,6 +7130,10 @@ 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: