From d5902e14f21a82489dd71af3a1841c2a0c766c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= <lukas@kucharczyk.xyz>
Date: Thu, 7 Nov 2024 15:10:18 +0100
Subject: [PATCH] gluetun-japan: add

---
 .env                  |   2 ++
 docker-compose.yml    |   1 +
 secrets/protonvpn.env | Bin 0 -> 109 bytes
 services/gluetun.yml  |  34 ++++++++++++++++++++++++++++++++++
 4 files changed, 37 insertions(+)
 create mode 100644 secrets/protonvpn.env
 create mode 100644 services/gluetun.yml

diff --git a/.env b/.env
index 97c0352..8b3c6fc 100644
--- a/.env
+++ b/.env
@@ -105,3 +105,5 @@ VAULTWARDEN_EXTERNAL_PORT=8666
 VAULTWARDEN_INTERNAL_PORT=80
 BAZARR_EXTERNAL_PORT=6767
 BAZARR_INTERNAL_PORT=6767
+GLUETUN_JAPAN_INTERNAL_PORT=8888
+GLUETUN_JAPAN_EXTERNAL_PORT=8888
diff --git a/docker-compose.yml b/docker-compose.yml
index fb65aa9..e56217d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,7 @@ include:
   - services/drone/drone.yml
   - services/enshrouded.yml
   - services/7dtdserver.yml
+  - services/gluetun.yml
 
 services:
   caddy:
diff --git a/secrets/protonvpn.env b/secrets/protonvpn.env
new file mode 100644
index 0000000000000000000000000000000000000000..9d969244f59a856955684a2adddd09b9c7047844
GIT binary patch
literal 109
zcmV-z0FwUzM@dveQdv+`0D#OZsKR{Myl<^Fhs|g;MSR8<ac=`gxzuD%YlsAAg4L;%
zf8-Nrs%Cc_ppN`FF;%DaFjWe*y)RZ(nTg_s<A)88GnxK;%48ZJm@UJ_R!uWxBpEK2
Php)i>Gr2p58Tjt>XGk*H

literal 0
HcmV?d00001

diff --git a/services/gluetun.yml b/services/gluetun.yml
new file mode 100644
index 0000000..ce2f636
--- /dev/null
+++ b/services/gluetun.yml
@@ -0,0 +1,34 @@
+---
+gluetun:
+    image: qmcgaw/gluetun
+    container_name: gluetun-japan
+    # line above must be uncommented to allow external containers to connect.
+    # See https://github.com/qdm12/gluetun-wiki/blob/main/setup/connect-a-container-to-gluetun.md#external-container-to-gluetun
+    cap_add:
+      - NET_ADMIN
+    devices:
+      - /dev/net/tun:/dev/net/tun
+    ports:
+      - 8888:8888/tcp # HTTP proxy
+      - 8388:8388/tcp # Shadowsocks
+      - 8388:8388/udp # Shadowsocks
+    volumes:
+      - "${DOCKER_STORAGE_PATH}/gluetun:/gluetun"
+    env_file:
+      - ../secrets/protonvpn.env
+    environment:
+      # See https://github.com/qdm12/gluetun-wiki/tree/main/setup#setup
+      - VPN_SERVICE_PROVIDER=protonvpn
+      - VPN_TYPE=openvpn
+      # OpenVPN:
+      - OPENVPN_USER=${PROTONVPN_USER}
+      - OPENVPN_PASSWORD=${PROTONVPN_PASSWORD}
+      # Wireguard:
+      # - WIREGUARD_PRIVATE_KEY=wOEI9rqqbDwnN8/Bpp22sVz48T71vJ4fYmFWujulwUU=
+      # - WIREGUARD_ADDRESSES=10.64.222.21/32
+      # Timezone for accurate log times
+      - TZ=${TZ}
+      - SERVER_COUNTRIES=Japan
+      # Server list updater
+      # See https://github.com/qdm12/gluetun-wiki/blob/main/setup/servers.md#update-the-vpn-servers-list
+      - UPDATER_PERIOD=
\ No newline at end of file