diff --git a/services/services.yaml b/services/services.yaml index ccb7fab..bcdea1f 100644 --- a/services/services.yaml +++ b/services/services.yaml @@ -122,7 +122,6 @@ services: - name: "youtube_downloaders" ports: - - 3006 - 3007 host: <<: *vm-tools-100-65 diff --git a/services/youtube_downloaders/.env b/services/youtube_downloaders/.env index 2b68adc..cd73c6b 100644 --- a/services/youtube_downloaders/.env +++ b/services/youtube_downloaders/.env @@ -3,3 +3,10 @@ BASE="/home/vm-user" METUBE_DOWNLOADS="${BASE}/Media/Music" METATUBE_DB="${BASE}/local-apps/youtube_downloaders/metatube/db" METATUBE_MIGRATIONS="${BASE}/local-apps/youtube_downloaders/metatube/migrations" + +GLUETUN_CONFIG_PATH="/home/vm-user/local-apps/yt-gluetun" +VPN_SERVICE_PROVIDER="mullvad" +VPN_TYPE="wireguard" +WIREGUARD_PRIVATE_KEY="sGNnFUHKVizv46foBs5HlOTu1H614uqOMOM3D2InrEE=" +WIREGUARD_ADDRESSES="10.73.19.33/32" +SERVER_COUNTRIES="Croatia" diff --git a/services/youtube_downloaders/docker-compose.yml b/services/youtube_downloaders/docker-compose.yml index 2a66bcb..d19fc6e 100644 --- a/services/youtube_downloaders/docker-compose.yml +++ b/services/youtube_downloaders/docker-compose.yml @@ -1,12 +1,31 @@ # Docker Compose for service youtube_downloaders created at Wed Apr 23 10:18:19 PM EEST 2025 services: + gluetun: + image: qmcgaw/gluetun + container_name: metube-gluetun + cap_add: + - NET_ADMIN + devices: + - /dev/net/tun:/dev/net/tun + ports: + - "${SVC_PORT_1}:8081" + volumes: + - ${GLUETUN_CONFIG_PATH}:/gluetun + environment: + - VPN_SERVICE_PROVIDER=${VPN_SERVICE_PROVIDER} + - VPN_TYPE=${VPN_TYPE} + - WIREGUARD_PRIVATE_KEY=${WIREGUARD_PRIVATE_KEY} + - WIREGUARD_ADDRESSES=${WIREGUARD_ADDRESSES} + - SERVER_COUNTRIES=${SERVER_COUNTRIES} metube-tg-gui: build: context: telegram-bot-fetcher container_name: metube_telegram_frontend restart: unless-stopped env_file: .telegram.env + network_mode: "service:gluetun" depends_on: + - gluetun - metube metube: @@ -15,7 +34,8 @@ services: restart: unless-stopped environment: - UID=1001 - ports: - - "${SVC_PORT_2}:8081" volumes: - - ${METUBE_DOWNLOADS}:/downloads:rw \ No newline at end of file + - ${METUBE_DOWNLOADS}:/downloads:rw + network_mode: "service:gluetun" + depends_on: + - gluetun \ No newline at end of file