From 4edc5b1b22cc8569286ddaea44047c920cb75c62 Mon Sep 17 00:00:00 2001 From: Adam French Date: Tue, 7 Apr 2026 13:37:24 +0100 Subject: [PATCH] Remove uptime-kuma and wallabag services, fix searxng base URL Remove unused uptime-kuma and wallabag services from docker-compose, nginx configs, and vite proxy. Use BASE_URL env var in searxng settings template instead of hardcoded URL. Co-Authored-By: Claude Opus 4.6 --- docker-compose.yml | 31 +--------------------- nginx/nginx.conf.template | 25 ------------------ nginx/nginx_dev.conf.template | 50 ----------------------------------- searxng/settings.yml.template | 2 +- vue/vite.config.js | 2 -- 5 files changed, 2 insertions(+), 108 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 48eb77b..21702fa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ volumes: dbdata: uploads: vue_dist: - uptime_kuma_data: + searxng_data: services: @@ -34,9 +34,7 @@ services: - gitea - hasura - quartz - - uptime-kuma - searxng - - wallabag networks: - app-network ports: @@ -134,16 +132,6 @@ services: volumes: - ${OBSIDIAN_DIR}:/quartz/content:ro - uptime-kuma: - image: louislam/uptime-kuma:1 - container_name: "${UPTIMEKUMA_HOST}" - restart: unless-stopped - networks: - - app-network - environment: - - UPTIME_KUMA_BASE_PATH=/uptime-kuma - volumes: - - uptime_kuma_data:/app/data searxng: build: @@ -160,23 +148,6 @@ services: volumes: - searxng_data:/etc/searxng - wallabag: - image: wallabag/wallabag:latest - container_name: "${WALLABAG_HOST}" - restart: unless-stopped - networks: - - app-network - depends_on: - - db - environment: - - SYMFONY__ENV__DOMAIN_NAME=https://www.${DOMAIN}/wallabag - - SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql - - SYMFONY__ENV__DATABASE_HOST=${POSTGRES_HOST} - - SYMFONY__ENV__DATABASE_PORT=${POSTGRES_PORT} - - SYMFONY__ENV__DATABASE_NAME=wallabag - - SYMFONY__ENV__DATABASE_USER=${POSTGRES_USER} - - SYMFONY__ENV__DATABASE_PASSWORD=${POSTGRES_PASSWORD} - gitea: image: docker.gitea.com/gitea:1.25.4-rootless diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template index 84257f9..63bc3d1 100644 --- a/nginx/nginx.conf.template +++ b/nginx/nginx.conf.template @@ -232,20 +232,6 @@ http { proxy_set_header X-Forwarded-Proto $scheme; } - location /uptime-kuma { - return 301 /uptime-kuma/; - } - - location /uptime-kuma/ { - proxy_pass http://$UPTIMEKUMA_HOST:$UPTIMEKUMA_PORT/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } location /searxng { return 301 /searxng/; @@ -259,17 +245,6 @@ http { proxy_set_header X-Forwarded-Proto $scheme; } - location /wallabag { - return 301 /wallabag/; - } - - location /wallabag/ { - proxy_pass http://$WALLABAG_HOST:$WALLABAG_PORT/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } } diff --git a/nginx/nginx_dev.conf.template b/nginx/nginx_dev.conf.template index 6151ee2..26d62d7 100644 --- a/nginx/nginx_dev.conf.template +++ b/nginx/nginx_dev.conf.template @@ -159,20 +159,6 @@ http { proxy_set_header X-Forwarded-Proto $scheme; } - location /uptime-kuma { - return 301 /uptime-kuma/; - } - - location /uptime-kuma/ { - proxy_pass http://$UPTIMEKUMA_HOST:$UPTIMEKUMA_PORT; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } location /searxng { return 301 /searxng/; @@ -186,17 +172,6 @@ http { proxy_set_header X-Forwarded-Proto $scheme; } - location /wallabag { - return 301 /wallabag/; - } - - location /wallabag/ { - proxy_pass http://$WALLABAG_HOST:$WALLABAG_PORT; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } } @@ -322,20 +297,6 @@ http { proxy_set_header X-Forwarded-Proto $scheme; } - location /uptime-kuma { - return 301 /uptime-kuma/; - } - - location /uptime-kuma/ { - proxy_pass http://$UPTIMEKUMA_HOST:$UPTIMEKUMA_PORT; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } location /searxng { return 301 /searxng/; @@ -349,17 +310,6 @@ http { proxy_set_header X-Forwarded-Proto $scheme; } - location /wallabag { - return 301 /wallabag/; - } - - location /wallabag/ { - proxy_pass http://$WALLABAG_HOST:$WALLABAG_PORT; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } } diff --git a/searxng/settings.yml.template b/searxng/settings.yml.template index 25b70cd..891b6af 100644 --- a/searxng/settings.yml.template +++ b/searxng/settings.yml.template @@ -1,5 +1,5 @@ use_default_settings: true server: - base_url: https://www.adam-french.co.uk/searxng/ + base_url: ${BASE_URL} secret_key: "${SEARXNG_SECRET_KEY}" diff --git a/vue/vite.config.js b/vue/vite.config.js index 69d894a..b1074ce 100644 --- a/vue/vite.config.js +++ b/vue/vite.config.js @@ -23,9 +23,7 @@ export default defineConfig({ "/api": "http://localhost:8080", "/gitea": "http://localhost:3000", "/radio": "http://localhost:8000", - "/uptime-kuma": "http://localhost:3001", "/searxng": "http://localhost:8080", - "/wallabag": "http://localhost:80", }, }, });