diff --git a/README.md b/README.md index 0f37a54..df072e5 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,4 @@ I use docker for all of my services that I run with a docker compose file. I us The homelab is run off of a dedicated server running a headless instance of Arch Linux. Arch linux is my Distro of preference however if I were to run a server that is required for reliability I would most likely prefer RedHat or similar for a stable environment over rolling release Arch but so far Arch has been fine. -Caddy is currently used to share my publicly facing services with a subdomain of mintyserver.net eg https://git.mintyserver.net. Not all services are reverse proxied such as my DNS server as they are only needed to be accessed by me and therefore only accessible via local or vpn connections. \ No newline at end of file +Caddy is currently used to share my publicly facing services with a subdomain of archox.org eg https://git.archox.org. Not all services are reverse proxied such as my DNS server as they are only needed to be accessed by me and therefore only accessible via local or vpn connections. diff --git a/docker-compose.d/Networking/caddy.yml b/docker-compose.d/Networking/caddy.yml index 77be6c6..937dcaf 100644 --- a/docker-compose.d/Networking/caddy.yml +++ b/docker-compose.d/Networking/caddy.yml @@ -13,7 +13,6 @@ services: - caddy_set:/etc/caddy - caddy_srv:/srv - caddy_data:/data - - piped-proxy:/var/run/ytproxy - caddy_config:/config environment: - CLOUDFLARE_API_TOKEN=${CF_CADDY_KEY} @@ -40,3 +39,5 @@ volumes: caddy_set: name: caddy_set external: true + caddy_html: + external: true diff --git a/docker-compose.d/Networking/ddns.yml b/docker-compose.d/Networking/ddns.yml index dceb3b6..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 + - 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/open-webui.yml b/docker-compose.d/Tools/open-webui.yml index bdc1af8..c6c15fe 100644 --- a/docker-compose.d/Tools/open-webui.yml +++ b/docker-compose.d/Tools/open-webui.yml @@ -5,11 +5,17 @@ services: restart: unless-stopped environment: - OLLAMA_BASE_URL=http://poslop-w:11434 - ports: - - 3636:8080 volumes: - open-webui:/app/backend/data + networks: + - caddy + volumes: open-webui: external: true + +networks: + caddy: + name: caddy + external: true diff --git a/docker-compose.d/Tools/pastefy.yml b/docker-compose.d/Tools/pastefy.yml new file mode 100644 index 0000000..3343604 --- /dev/null +++ b/docker-compose.d/Tools/pastefy.yml @@ -0,0 +1,45 @@ +services: + pastedb: + container_name: pastedb + image: mariadb:10.11 + volumes: + - pastedb:/var/lib/mysql + + environment: + MYSQL_ROOT_PASSWORD: pastefy + MYSQL_DATABASE: pastefy + MYSQL_USER: pastefy + MYSQL_PASSWORD: pastefy + networks: + - pastefy + + pastefy: + container_name: pastefy + depends_on: + - pastedb + image: interaapps/pastefy:latest + + environment: + HTTP_SERVER_PORT: 80 + HTTP_SERVER_CORS: "*" + DATABASE_DRIVER: mysql + DATABASE_NAME: pastefy + DATABASE_USER: pastefy + DATABASE_PASSWORD: pastefy + DATABASE_HOST: pastedb + DATABASE_PORT: 3306 + SERVER_NAME: "https://p.archfox.org" + networks: + - caddy + - pastefy + +volumes: + pastedb: + external: true + +networks: + pastefy: + name: pastefy + caddy: + name: caddy + external: true diff --git a/docker-compose.d/Tools/qbit.yml b/docker-compose.d/Tools/qbit.yml index 2209541..4a9378e 100644 --- a/docker-compose.d/Tools/qbit.yml +++ b/docker-compose.d/Tools/qbit.yml @@ -27,9 +27,10 @@ services: - VPN_SERVICE_PROVIDER=mullvad - VPN_TYPE=wireguard - WIREGUARD_PRIVATE_KEY=${MULLKEY} - - WIREGUARD_ADDRESSES=10.73.197.103/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: diff --git a/scripts/run-all.sh b/scripts/run-all.sh index 2b06768..403d9a0 100755 --- a/scripts/run-all.sh +++ b/scripts/run-all.sh @@ -26,8 +26,9 @@ services=( "Tools/qbit.yml" "Tools/open-webui.yml" "Tools/watchtower.yml" + "Tools/pastefy.yml" + "Tools/actual.yml" "pterodactyl/docker-compose.yml" - "Piped-Docker/docker-compose.yml" ) # Start building the docker compose command with multiple -f flags