Auto Merge of PR 57 - replace-scraperr-maxun-deployment

Merged by Trez.One

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

@@ -5,6 +5,7 @@ on:
       - 'main'
     paths:
       - '**/docker-compose.yml'
+      - '**/pr-cloudflare-docker-deploy.yml'
       - '!ansible/**.yml'
 jobs:
   check-and-create-pr:
@@ -72,6 +73,9 @@ jobs:
       - name: Fetch base branch
         run: |
           git fetch origin ${{ github.event.pull_request.base.ref }}
+      - name: Login to Gitea Container Registry
+        run: |
+          docker login -u gitea-sonarqube-bot -p ${{ secrets.BOT_GITEA_TOKEN }} https://git.trez.wtf
       - name: Save both versions of docker-compose.yml
         run: |
           git show origin/main:docker-compose.yml > docker-compose-main.yml || touch docker-compose-main.yml
@@ -313,11 +317,8 @@ jobs:
       - name: Install Vault
         uses: cpanato/vault-installer@main
       - name: Login to Gitea Container Registry
-        uses: docker/login-action@v3
+        run: |
-        with:
+          docker login -u gitea-sonarqube-bot -p ${{ secrets.BOT_GITEA_TOKEN }} http://gitea:3000
-          registry: https://git.trez.wtf
-          username: gitea-sonarqube-bot
-          password: ${{ secrets.BOT_GITEA_TOKEN }}
       - name: Gotify Notification
         uses: eikendev/gotify-action@master
         with:

README.md

@@ -85,8 +85,11 @@
 | mariadb | linuxserver/mariadb |
 | mastodon | lscr.io/linuxserver/mastodon:latest |
 | mastodon-pg-db | postgres:17-alpine |
+| maxun-backend | getmaxun/maxun-backend:latest |
+| maxun-frontend | getmaxun/maxun-frontend:latest |
+| maxun-pg-db | postgres:17-alpine |
 | meilisearch | getmeili/meilisearch:v1.12.3 |
-| minio | minio/minio |
+| minio | minio/minio:RELEASE.2025-04-22T22-12-26Z |
 | mixpost | inovector/mixpost:latest |
 | mongodb | bitnami/mongodb:7.0 |
 | multi-scrobbler | foxxmd/multi-scrobbler |
@@ -122,8 +125,6 @@
 | romm | rommapp/romm:latest |
 | sabnzbdvpn | ghcr.io/binhex/arch-sabnzbdvpn:latest |
 | sablier | sablierapp/sablier: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.12.14 |

docker-compose.yml

@@ -80,6 +80,36 @@ x-shared:
       - zammad-memcached
       - zammad-postgresql
       - zammad-redis
+x-maxun: &maxun-env
+  environment:
+    NODE_ENV: production
+    JWT_SECRET: ${MAXUN_JWT_SECRET}
+    DB_NAME: maxun
+    DB_USER: maxun
+    DB_PASSWORD: ${MAXUN_DB_PASSWORD}
+    DB_HOST: maxun-pg-db
+    DB_PORT: 5432
+    ENCRYPTION_KEY: ${MAXUN_ENCRYPTION_KEY}
+    SESSION_SECRET: ${MAXUN_SESSION_SECRET}
+    MINIO_ENDPOINT: minio
+    MINIO_PORT: 9000
+    MINIO_CONSOLE_PORT: 9001
+    MINIO_ACCESS_KEY: ${MAXUN_MINIO_ACCESS_KEY}
+    MINIO_SECRET_KEY: ${MAXUN_MINIO_SECRET_KEY}
+    REDIS_HOST: redis
+    REDIS_PORT: 6379
+    BACKEND_PORT: 8080
+    FRONTEND_PORT: 5173
+    BACKEND_URL: http://maxun-backend:8080
+    PUBLIC_URL: http://maxun-frontend:5173
+    VITE_BACKEND_URL: http://maxun-backend:8080
+    VITE_PUBLIC_URL: http://maxun-frontend:5173
+    MAXUN_TELEMETRY: true
+    PLAYWRIGHT_BROWSERS_PATH: /ms-playwright
+    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 0
+    CHROMIUM_FLAGS: '--disable-gpu --no-sandbox --headless=new'
+    #DEBUG: pw:api
+    #PWDEBUG: 1
 services:
   actual_server:
     container_name: actualbudget
@@ -97,9 +127,6 @@ services:
       swag_port: 5006
       swag_proto: http
       swag_url: fin.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       homepage.group: Lifestyle
       homepage.name: Actual Budget
       homepage.icon: actual-budget.svg
@@ -119,9 +146,6 @@ services:
       swag: enable
       swag_proto: http
       swag_url: adgh.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       homepage.group: System Administration
       homepage.name: AdGuard Home
       homepage.icon: adguard-home.png
@@ -190,9 +214,6 @@ services:
       swag_port: 8000
       swag_proto: http
       swag_url: archive.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://archive.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -225,9 +246,6 @@ services:
       swag_address: audiobookshelf
       swag_proto: http
       swag_url: abs.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://abs.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -293,9 +311,6 @@ services:
       swag_proto: http
       swag_port: 9091
       swag_url: auth.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://auth.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -347,9 +362,6 @@ services:
       swag: enable
       swag_proto: http
       swag_port: 6767
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://bazaar.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -395,9 +407,6 @@ services:
       swag_proto: http
       swag_port: 8090
       swag_url: beszel.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://beszel.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -449,9 +458,6 @@ services:
       swag_url: bitwarden.${MY_TLD}
       swag_proto: http
       swag_port: 80
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://bitwarden.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -505,9 +511,6 @@ services:
       swag: enable
       swag_port: 3000
       swag_url: bsky.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://bsky.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -563,9 +566,6 @@ services:
       swag_port: 5000
       swag_proto: http
       swag_url: gist.trez.wtf
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://gist.trez.wtf
       swag.uptime-kuma.monitor.interval: 300
@@ -611,9 +611,6 @@ services:
       swag_address: castopod
       swag_port: 8000
       swag_url: pod.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://pod.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -673,9 +670,6 @@ services:
       swag_port: 3000
       swag_proto: http
       swag_url: convert.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://convert.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -703,9 +697,6 @@ services:
       swag_port: 3012
       swag_proto: http
       swag_url: cron.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://cron.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -788,9 +779,6 @@ services:
       swag_port: 3000
       swag_proto: http
       swag_url: csec.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://csec.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -818,9 +806,6 @@ services:
       swag_port: 8000
       swag_proto: http
       swag_url: cchef.trez.wtf
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://cchef.trez.wtf
       swag.uptime-kuma.monitor.interval: 300
@@ -847,9 +832,6 @@ services:
       swag_port: 5800
       swag_proto: http
       swag_url: czkawka.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://czkawka.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -920,9 +902,6 @@ services:
       swag_port: 3000
       swag_proto: http
       swag_url: loc.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://loc.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -1018,9 +997,6 @@ services:
       swag_port: 8080
       swag_proto: http
       swag_url: dms.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://dms.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -1078,9 +1054,6 @@ services:
       swag_port: 8200
       swag_proto: http
       swag_url: dup.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       homepage.group: Automation
       homepage.name: Duplicati
       homepage.href: https://dup.${MY_TLD}
@@ -1130,9 +1103,6 @@ services:
       swag: enable
       swag_proto: http
       swag_url: draw.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://draw.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -1186,9 +1156,6 @@ services:
       swag_proto: http
       swag_port: 8080
       swag_url: health.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://health.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -1270,9 +1237,6 @@ services:
       swag_port: 2368
       swag_proto: http
       swag_url: blog.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://blog.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -1314,9 +1278,6 @@ services:
       homepage.widget.key: ${GITEA_HOMEPAGE_API_KEY}
       swag: enable
       swag_url: git.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://git.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -1462,9 +1423,6 @@ services:
       homepage.widget.key: ${GOTIFY_HOMEPAGE_CLIENT_KEY}
       swag: enable
       swag_proto: http
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://gotify.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -1516,9 +1474,6 @@ services:
       swag_port: 9000
       swag_url: logs.${MY_TLD}
       swag_proto: http
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://logs.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -1584,9 +1539,6 @@ services:
       swag_proto: http
       swag_port: 8080
       swag_url: guac.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://guac.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -1637,9 +1589,6 @@ services:
       swag_proto: http
       swag_port: 1313
       swag_url: it-services.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://it-services.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -1684,9 +1633,6 @@ services:
       swag_proto: http
       swag_port: 2283
       swag_url: pics.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
 
         location /share {
               proxy_pass http://immich-public-proxy:3000;
@@ -1807,9 +1753,6 @@ services:
       swag_proto: http
       swag_port: 8086
       swag_url: influxdb.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://influxdb.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -1843,9 +1786,6 @@ services:
       swag_proto: http
       swag_port: 3000
       swag_url: invid.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://invid.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -2011,9 +1951,6 @@ services:
       swag: enable
       swag_proto: http
       swag_url: itt.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://itt.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -2050,9 +1987,6 @@ services:
       swag_url: jf.${MY_TLD}
       swag_port: 8096
       swag_proto: http
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://jf.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -2604,9 +2538,6 @@ services:
       swag: enable
       swag_proto: https
       swag_url: meet.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://meet.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -2688,9 +2619,6 @@ services:
       homepage.description: Open-source note taking & to-do
       swag: enable
       swag_url: notes.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://notes.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -2734,9 +2662,6 @@ services:
       swag_port: 3080
       swag_proto: http
       swag_url: ai.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://ai.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -2815,9 +2740,6 @@ services:
       homepage.widget.url: http://lidarr:8686
       homepage.widget.key: ${LIDARR_API_KEY}
       swag: enable
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://lidarr.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -2865,9 +2787,6 @@ services:
       swag_proto: http
       swag_port: 5000
       swag_url: lidify.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://lidify.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -2911,9 +2830,6 @@ services:
       swag: enable
       swag_proto: https
       swag_url: profile.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://profile.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -2942,9 +2858,6 @@ services:
       swag_proto: http
       swag_port: 17170
       swag_url: ldap.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://ldap.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -2994,9 +2907,6 @@ services:
       swag_proto: http
       swag_port: 42010
       swag_url: maloja.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://maloja.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3042,9 +2952,6 @@ services:
       swag_proto: http
       swag_port: 3214
       swag_url: 3dprint.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://3dprint.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3138,9 +3045,6 @@ services:
       swag_proto: http
       swag_port: 80
       swag_url: mastodon.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://mastodon.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3175,6 +3079,61 @@ services:
     restart: always
     volumes:
       - mastodon-pg-db:/var/lib/postgresql/data
+  maxun-backend:
+    container_name: maxun-backend
+    depends_on:
+      - maxun-pg-db
+      - minio
+    <<: *maxun-env
+    expose:
+      - 8080
+    image: getmaxun/maxun-backend:latest
+    mem_limit: 2g   # Set a 2GB memory limit
+    security_opt:
+      - seccomp=unconfined  # This might help with browser sandbox issues
+    shm_size: '2gb' # Increase shared memory size for Chromium
+    restart: unless-stopped
+    volumes:
+      - /var/run/dbus:/var/run/dbus
+  maxun-frontend:
+    container_name: maxun-frontend
+    depends_on:
+      - maxun-backend
+    <<: *maxun-env
+    image: getmaxun/maxun-frontend:latest
+    labels:
+      swag: enable
+      swag_proto: http
+      swag_port: 5173
+      swag_url: scrape.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://scrape.${MY_TLD}
+      swag.uptime-kuma.monitor.interval: 300
+      homepage.group: Personal/Professional Services
+      homepage.name: Maxun
+      homepage.href: https://scrape.${MY_TLD}
+      homepage.icon: sh-maxun.svg
+      homepage.description: No-code web data extraction platform
+    ports:
+      - 5173:5173
+    restart: unless-stopped
+  maxun-pg-db:
+    container_name: maxun-pg-db
+    image: postgres:17-alpine
+    environment:
+      POSTGRES_USER: maxun
+      POSTGRES_PASSWORD: ${MAXUN_DB_PASSWORD}
+      POSTGRES_DB: maxun
+    expose:
+      - 5432
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    restart: unless-stopped
+    volumes:
+      - maxun-pg-data:/var/lib/postgresql/data
   meilisearch:
     container_name: meilisearch
     environment:
@@ -3201,9 +3160,6 @@ services:
       swag_proto: http
       swag_port: 9090
       swag_url: s3.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://s3.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3252,9 +3208,6 @@ services:
       swag_port: 80
       swag_proto: http
       swag_url: social.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://social.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3314,9 +3267,6 @@ services:
       swag_proto: http
       swag_port: 9078
       swag_url: scrobble.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://scrobble.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3346,9 +3296,6 @@ services:
       swag_proto: http
       swag_port: 5678
       swag_url: n8n.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://n8n.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3401,9 +3348,6 @@ services:
       swag_port: 4533
       swag_proto: http
       swag_url: navi.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://navi.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3504,9 +3448,6 @@ services:
       homepage.widget.url: http://ombi:3579
       homepage.widget.key: ${OMBI_API_KEY}
       swag: enable
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://ombi.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3542,9 +3483,6 @@ services:
       homepage.icon: sh-omnitools.svg
       homepage.description: Tools for common tasks
       swag: enable
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag_url: otools.${MY_TLD}
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://otools.${MY_TLD}
@@ -3579,9 +3517,6 @@ services:
       homepage.description: Open-source language translation with LanguageTool, LibreTranslate, & Ollama
       swag: enable
       swag_url: translate.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://translate.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3613,9 +3548,6 @@ services:
       swag_proto: http
       swag_port: 8000
       swag_url: docs.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://docs.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3668,9 +3600,6 @@ services:
       swag_proto: http
       swag_port: 8085
       swag_url: pg.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
     ports:
       - "8085:8085" # Access the web interface at http://localhost:8085
     restart: unless-stopped
@@ -3715,9 +3644,6 @@ services:
       swag_proto: http
       swag_port: 9000
       swag_url: portainer.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://portainer.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3752,9 +3678,6 @@ services:
       swag_proto: http
       swag_port: 3000
       swag_url: ports.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://ports.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3812,9 +3735,6 @@ services:
       swag_port: 5000
       swag_address: postal-web
       swag_url: post.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://post.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3871,9 +3791,6 @@ services:
       homepage.widget.url: http://prowlarr:9696
       homepage.widget.key: ${PROWLARR_API_KEY}
       swag: enable
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://prowlarr.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3933,14 +3850,11 @@ services:
       homepage.widget.type: qbittorrent
       homepage.widget.url: http://qbittorrentvpn:8080
       homepage.widget.user: admin
-      homepage.widget.password: ${DELUGEVPN_PASSWORD}
+      homepage.widget.password: "${DELUGEVPN_PASSWORD}"
       swag: enable
       swag_port: 8080
       swag_proto: http
       swag_url: qbit.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://qbit.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -3989,9 +3903,6 @@ services:
       swag_port: 5000
       swag_auth: authelia
       swag_url: radarec.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://radarec.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4033,9 +3944,6 @@ services:
       homepage.widget.url: http://radarr:7878
       homepage.widget.key: ${RADARR_API_KEY}
       swag: enable
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://radarr.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4093,9 +4001,6 @@ services:
       swag_proto: http
       swag_port: 3000
       swag_url: resume.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://resume.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4138,9 +4043,6 @@ services:
       homepage.widget.url: http://readarr:8787
       homepage.widget.key: ${READARR_API_KEY}
       swag: enable
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://readarr.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4214,9 +4116,6 @@ services:
       swag_proto: http
       swag_port: 8080
       swag_url: rlib.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://rlib.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4260,9 +4159,6 @@ services:
       swag_proto: http
       swag_port: 3000
       swag_url: chat.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://chat.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4322,9 +4218,6 @@ services:
       swag: enable
       swag_proto: http
       swag_url: romm.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://romm.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4372,9 +4265,6 @@ services:
       swag: enable
       swag_proto: http
       swag_url: sabnzbd.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://sabnzbd.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4428,57 +4318,6 @@ services:
       - ${DOCKER_VOLUME_CONFIG}/sablier/state:/opt/sablier/state
       - ${DOCKER_VOLUME_CONFIG}/sablier/custom_themes:/opt/sablier/custom_themes
       - /var/run/docker.sock:/var/run/docker.sock
-  scraperr:
-    command:
-      - npm
-      - run
-      - start
-    container_name: scraperr
-    depends_on:
-      - scraperr-api
-    expose:
-      - 3000
-    image: jpyles0524/scraperr:latest
-    labels:
-      homepage.group: Personal/Professional Services
-      homepage.name: Scraperr
-      homepage.href: https://scrape.${MY_TLD}
-      homepage.icon: /icons/scraperr.png
-      homepage.description: Web scraper
-      swag: enable
-      swag_proto: http
-      swag_port: 3000
-      swag_url: scrape.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
-
-        location /api {
-              proxy_pass http://scraperr-api:8000;
-        }
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://scrape.${MY_TLD}
-      swag.uptime-kuma.monitor.interval: 300
-    restart: unless-stopped
-  scraperr-api:
-    container_name: scraperr-api
-    environment:
-      LOG_LEVEL: DEBUG
-      OLLAMA_URL: http://ollama:11434
-      OLLAMA_MODEL: phi3
-      MONGODB_URI: mongodb://scraperr:${SCRAPERR_MONGODB_PASSWORD}@mongodb:27017/scraperr?replicaSet=rinoa
-      REGISTRATION_ENABLED: true
-      SECRET_KEY: ${SCRAPERR_SECRET_KEY}
-      ALGORITHM: HS256
-      ACCESS_TOKEN_EXPIRE_MINUTES: 600
-      DOCKER_HOST: tcp://dockerproxy:2375
-    expose:
-      - 8000
-    image: jpyles0524/scraperr_api:latest
-    restart: unless-stopped
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/scraperr:/project/data
-      # - /var/run/docker.sock:/var/run/docker.sock
   scrutiny:
     cap_add:
       - SYS_RAWIO
@@ -4544,9 +4383,6 @@ services:
       swag_address: searxng
       swag_proto: http
       swag_url: search.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://search.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4595,9 +4431,6 @@ services:
       swag_port: 3000
       swag_proto: http
       swag_url: devops.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://devops.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4638,9 +4471,6 @@ services:
       swag_proto: http
       swag_port: 9000
       swag_url: sqube.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://sqube.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4688,9 +4518,6 @@ services:
       homepage.widget.url: http://sonarr:8989
       homepage.widget.key: ${SONARR_API_KEY}
       swag: enable
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://sonarr.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4736,9 +4563,6 @@ services:
       swag_proto: http
       swag_port: 5000
       swag_url: sonashow.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://sonashow.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4782,9 +4606,6 @@ services:
       swag: enable
       swag_proto: http
       swag_url: speed.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://speed.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4816,9 +4637,6 @@ services:
       swag_auth: authelia
       swag_proto: http
       swag_url: sd.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://sd.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4848,9 +4666,6 @@ services:
       swag_port: 8080
       swag_proto: http
       swag_url: pdf.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://pdf.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -4947,9 +4762,6 @@ services:
       swag: enable
       swag_proto: http
       swag_url: recipes.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://recipes.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -5006,9 +4818,6 @@ services:
       swag_port: 8888
       swag_url: unmanic.${MY_TLD}
       swag_proto: http
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://unmanic.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -5059,9 +4868,6 @@ services:
       swag: enable
       swag_proto: http
       swag_url: uptime.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
     networks:
       default: null
     ports:
@@ -5104,9 +4910,6 @@ services:
       swag_proto: http
       swag_port: 8200
       swag_url: vault.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://vault.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -5157,9 +4960,6 @@ services:
       swag: enable
       swag_address: wallabag
       swag_proto: http
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://wallabag.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -5195,9 +4995,6 @@ services:
       swag: enable
       swag_proto: http
       swag_url: subs.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://subs.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -5385,9 +5182,6 @@ services:
       swag_port: 8080
       swag_proto: http
       swag_url: dbs.${MY_TLD}
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://dbs.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -5412,9 +5206,6 @@ services:
       swag_proto: http
       swag_url: ytdl.${MY_TLD}
       swag_port: 8080
-      swag_server_custom_directive: |
-        access_log /config/log/$$host_access.log ;
-        error_log /config/log/$$host_error.log ;
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://ytdl.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
@@ -5598,6 +5389,8 @@ volumes:
     name: lldap_data
   mastodon-pg-db:
     name: mastodon-pg-db
+  maxun-pg-data:
+    name: maxun-pg-data
   mixpost-storage:
     name: mixpost-storage
   mixpost-logs: