diff --git a/Caddyfile b/Caddyfile index d17c528..926e6e9 100644 --- a/Caddyfile +++ b/Caddyfile @@ -83,14 +83,14 @@ wings.archfox.org { reverse_proxy twings:443 } -#omada.archfox.org { -# reverse_proxy host.docker.internal:8043 { +omada.archfox.org { + reverse_proxy host.docker.internal:8043 #{ # transport http { # tls_insecure_skip_verify # } # header_up Host "omada.archfox.org:443" # } -#} +} ai.archfox.org { reverse_proxy open-webui:8080 diff --git a/docker-compose.d/Tools/qbit.yml b/docker-compose.d/Tools/qbit.yml index 4a9378e..1bd3402 100644 --- a/docker-compose.d/Tools/qbit.yml +++ b/docker-compose.d/Tools/qbit.yml @@ -16,39 +16,35 @@ services: depends_on: gluetun: condition: service_healthy - - gluetun: image: qmcgaw/gluetun:v3 cap_add: - NET_ADMIN container_name: gluetun environment: - - VPN_SERVICE_PROVIDER=mullvad + - VPN_SERVICE_PROVIDER=mullvad - VPN_TYPE=wireguard - - WIREGUARD_PRIVATE_KEY=${MULLKEY} - - WIREGUARD_ADDRESSES=10.75.99.140/32 + - WIREGUARD_PRIVATE_KEY=${MULLKEY} + - WIREGUARD_ADDRESSES=10.67.20.141/32 - SERVER_COUNTRIES=USA - SERVER_CITIES=Chicago IL - #- DNS_ADDRESS=10.64.0.1 + - DNS_ADDRESS=10.64.0.1 volumes: - gluetun:/gluetun devices: - - /dev/net/tun:/dev/net/tun + - /dev/net/tun:/dev/net/tun ports: - 8181:8181 - 6881:6881 - 6881:6881/udp restart: unless-stopped networks: - - qbit - + - qbit volumes: qbittorrent: external: true gluetun: external: true - networks: - qbit: - external: true + qbit: + external: true diff --git a/docker-compose.d/Tools/searxng.yml b/docker-compose.d/Tools/searxng.yml index cec158e..b8e8299 100644 --- a/docker-compose.d/Tools/searxng.yml +++ b/docker-compose.d/Tools/searxng.yml @@ -2,20 +2,14 @@ services: searxng: image: searxng/searxng:latest container_name: searxng - environment: + environment: - BASE_URL=https://searxng.archfox.org volumes: - - searxng:/etc/searxng + - ${Volumes}/searxng:/etc/searxng restart: unless-stopped - networks: + networks: - caddy - networks: caddy: name: caddy external: true - -volumes: - searxng: - name: searxng - external: true diff --git a/docker-compose.d/Tools/watchtower.yml b/docker-compose.d/Tools/watchtower.yml deleted file mode 100644 index 0b3ed14..0000000 --- a/docker-compose.d/Tools/watchtower.yml +++ /dev/null @@ -1,6 +0,0 @@ -services: - watchtower: - container_name: watchtower - image: containrrr/watchtower - volumes: - - /var/run/docker.sock:/var/run/docker.sock diff --git a/scripts/run-all.sh b/scripts/run-all.sh index d65cf86..c8ce6aa 100755 --- a/scripts/run-all.sh +++ b/scripts/run-all.sh @@ -31,7 +31,6 @@ services=( "Tools/redbot.yml" "Tools/searxng.yml" "Tools/sftpgo.yml" - "Tools/watchtower.yml" "pterodactyl/docker-compose.yml" ) @@ -44,7 +43,7 @@ for service in "${services[@]}"; do done # Add the up command to the final docker compose command -COMPOSE_COMMAND+=" --profile panel --profile daemon up -d" +COMPOSE_COMMAND+=" --profile panel --profile daemon up -d --remove-orphans" # Execute the composed command eval $COMPOSE_COMMAND