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..2e76b52 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 - PROXIED=false 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..f94f4d1 100644 --- a/docker-compose.d/Tools/qbit.yml +++ b/docker-compose.d/Tools/qbit.yml @@ -8,14 +8,16 @@ services: - PGID=1000 - TZ=Etc/UTC - WEBUI_PORT=8181 - network_mode: "service:gluetun" + #network_mode: "service:gluetun" + ports: + - 8181:8181 volumes: - qbittorrent:/config - /mnt/nextcloud:/mnt/files restart: unless-stopped - depends_on: - gluetun: - condition: service_healthy + # depends_on: + # gluetun: + # condition: service_healthy gluetun: @@ -27,15 +29,14 @@ services: - VPN_SERVICE_PROVIDER=mullvad - VPN_TYPE=wireguard - WIREGUARD_PRIVATE_KEY=${MULLKEY} - - WIREGUARD_ADDRESSES=10.73.197.103/32 + - WIREGUARD_ADDRESSES=68.235.46.126/32 - DNS_ADDRESS=10.64.0.1 - - SERVER_CITIES=Chicago IL 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 2b06768..e5b4e1b 100755 --- a/scripts/run-all.sh +++ b/scripts/run-all.sh @@ -26,8 +26,8 @@ services=( "Tools/qbit.yml" "Tools/open-webui.yml" "Tools/watchtower.yml" + "Tools/pastefy.yml" "pterodactyl/docker-compose.yml" - "Piped-Docker/docker-compose.yml" ) # Start building the docker compose command with multiple -f flags