diff --git a/docker-compose.d/Networking/ddns.yml b/docker-compose.d/Networking/ddns.yml index 2e76b52..854e0e2 100644 --- a/docker-compose.d/Networking/ddns.yml +++ b/docker-compose.d/Networking/ddns.yml @@ -10,5 +10,5 @@ services: security_opt: [no-new-privileges:true] environment: - CLOUDFLARE_API_TOKEN=${CFKEY} - - DOMAINS=archfox.org, jelly.archfox.org, searxng.archfox.org, bookstack.archfox.org, vault.archfox.org, git.archfox.org, nextcloud.archfox.org, aria.archfox.org, wings.archfox.org, panel.archfox.org, omada.archfox.org, mc.archfox.org, ai.archfox.org, p.archfox.org + - DOMAINS=archfox.org, jelly.archfox.org, searxng.archfox.org, bookstack.archfox.org, vault.archfox.org, git.archfox.org, nextcloud.archfox.org, aria.archfox.org, wings.archfox.org, panel.archfox.org, omada.archfox.org, mc.archfox.org, ai.archfox.org, p.archfox.org, actual.archfox.org - PROXIED=false diff --git a/docker-compose.d/Tools/actual.yml b/docker-compose.d/Tools/actual.yml new file mode 100644 index 0000000..051e2f0 --- /dev/null +++ b/docker-compose.d/Tools/actual.yml @@ -0,0 +1,27 @@ +services: + actual_server: + container_name: actual + image: docker.io/actualbudget/actual-server:latest + environment: + - ACTUAL_UPLOAD_FILE_SYNC_SIZE_LIMIT_MB=100 + - ACTUAL_UPLOAD_SYNC_ENCRYPTED_FILE_SYNC_SIZE_LIMIT_MB=100 + - ACTUAL_UPLOAD_FILE_SIZE_LIMIT_MB=100 + volumes: + - actual-data:/data + networks: + - caddy + healthcheck: + test: ['CMD-SHELL', 'node src/scripts/health-check.js'] + interval: 60s + timeout: 10s + retries: 3 + start_period: 20s + restart: unless-stopped + +volumes: + actual-data: + external: true + +networks: + caddy: + external: true diff --git a/docker-compose.d/Tools/qbit.yml b/docker-compose.d/Tools/qbit.yml index f94f4d1..4a9378e 100644 --- a/docker-compose.d/Tools/qbit.yml +++ b/docker-compose.d/Tools/qbit.yml @@ -8,16 +8,14 @@ services: - PGID=1000 - TZ=Etc/UTC - WEBUI_PORT=8181 - #network_mode: "service:gluetun" - ports: - - 8181:8181 + network_mode: "service:gluetun" volumes: - qbittorrent:/config - /mnt/nextcloud:/mnt/files restart: unless-stopped - # depends_on: - # gluetun: - # condition: service_healthy + depends_on: + gluetun: + condition: service_healthy gluetun: @@ -29,14 +27,16 @@ services: - VPN_SERVICE_PROVIDER=mullvad - VPN_TYPE=wireguard - WIREGUARD_PRIVATE_KEY=${MULLKEY} - - WIREGUARD_ADDRESSES=68.235.46.126/32 - - DNS_ADDRESS=10.64.0.1 + - WIREGUARD_ADDRESSES=10.75.99.140/32 + - SERVER_COUNTRIES=USA + - SERVER_CITIES=Chicago IL + #- DNS_ADDRESS=10.64.0.1 volumes: - gluetun:/gluetun devices: - /dev/net/tun:/dev/net/tun ports: - # - 8181:8181 + - 8181:8181 - 6881:6881 - 6881:6881/udp restart: unless-stopped diff --git a/scripts/run-all.sh b/scripts/run-all.sh index e5b4e1b..403d9a0 100755 --- a/scripts/run-all.sh +++ b/scripts/run-all.sh @@ -27,6 +27,7 @@ services=( "Tools/open-webui.yml" "Tools/watchtower.yml" "Tools/pastefy.yml" + "Tools/actual.yml" "pterodactyl/docker-compose.yml" )