From 3601dd74606cf02258568af5230568389708e2a0 Mon Sep 17 00:00:00 2001
From: Penelope Gwen <support@pogmom.me>
Date: Wed, 19 Mar 2025 23:22:25 -0700
Subject: [PATCH] 2025-03-19 23:22

---
 networking/docker-compose.yml | 25 +------------------------
 searxng/docker-compose.yml    | 10 ++++++----
 searxng/searxng.env_template  |  3 +--
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/networking/docker-compose.yml b/networking/docker-compose.yml
index d8773f5..d69d76e 100644
--- a/networking/docker-compose.yml
+++ b/networking/docker-compose.yml
@@ -1,13 +1,5 @@
 version: "3.8"
 
-networks:
-  docker-local:
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-        - subnet: ${NETWORKING_SUBNET_PREFIX}0/24
-
 services:
 
   ddns-updater: # dns updater, prevents issues caused by cycling residential ip address https://hub.docker.com/r/qmcgaw/ddns-updater
@@ -26,25 +18,10 @@ services:
   nginx-proxy-manager: # web ui for managing nginx reverse proxy config https://nginxproxymanager.com/
     image: jc21/nginx-proxy-manager:latest
     container_name: nginx-proxy-manager
-    networks:
-      docker-local:
-        ipv4_address: ${NETWORKING_SUBNET_PREFIX}5
+    network_mode: host
     volumes:
       - ${DATA_PATH}/nginx-proxy-manager/data:/data
       - ${DATA_PATH}/nginx-proxy-manager/letsencrypt:/etc/letsencrypt
       - ${DATA_PATH}/nginx-proxy-manager/static:/static
       - ${DATA_PATH}/nginx-proxy-manager/snippets:/snippets:ro
-    ports:
-      - ${NGINX_HTTP_PORT}:80
-      - ${NGINX_WEBUI_PORT}:81
-      - ${NGINX_HTTPS_PORT}:443
-      - ${MC_JAVA_PORT}:25565
-      - ${MC_BEDROCK_PORT}:19132
-      - ${MC_VOICE_PORT}:24454
-      - ${TERRARIA_PORT}:7777
-      - ${NC_TALK_PORT}:3478
-      - ${GITEA_SSH_PORT}:1022
-      - ${GITEA_SSH_PORT_ALT}:10022
-      - ${SMTP_PORT}:1025
-      - ${IMAP_PORT}:1143
     restart: unless-stopped
diff --git a/searxng/docker-compose.yml b/searxng/docker-compose.yml
index 603921f..a56d37c 100644
--- a/searxng/docker-compose.yml
+++ b/searxng/docker-compose.yml
@@ -12,15 +12,15 @@ services:
       - NET_ADMIN
     environment:
       - VPN_SERVICE_PROVIDER=protonvpn
-      - OPENVPN_USER=${VPN_USER}
-      - OPENVPN_PASSWORD=${VPN_PASS}
+      - VPN_TYPE=wireguard
+      - WIREGUARD_PRIVATE_KEY=${WG_PRIV_KEY}
       - SERVER_COUNTRIES=${WG_COUNTRIES}
       - VPN_PORT_FORWARDING=off
     ports:
       - ${SEARXNG_PORT}:8080
     restart: unless-stopped
 
-  redis:
+  searxng-redis:
     container_name: searxng-redis
     image: docker.io/valkey/valkey:7-alpine
     command: valkey-server --save 30 1 --loglevel warning
@@ -47,7 +47,6 @@ services:
     network_mode: "service:gluetun"
     volumes:
       - ${DATA_PATH}/searxng/data:/etc/searxng:rw
-      - ${DATA_PATH}/searxng/theme/pogmom:/usr/local/searxng/searx/static/themes/pogmom:rw
     environment:
       - SEARXNG_BASE_URL=https://${SEARXNG_HOSTNAME}/
     cap_drop:
@@ -61,3 +60,6 @@ services:
       options:
         max-size: "1m"
         max-file: "1"
+    depends_on:
+      - searxng-redis
+      - gluetun
diff --git a/searxng/searxng.env_template b/searxng/searxng.env_template
index 4becfe9..500015e 100644
--- a/searxng/searxng.env_template
+++ b/searxng/searxng.env_template
@@ -1,6 +1,5 @@
 #vpn
-VPN_USER=
-VPN_PASS=
+WG_PRIV_KEY=
 WG_COUNTRIES=
 #searxng
 SEARXNG_HOSTNAME=