gluetun: fix env file

.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

docker-compose.yml

@@ -19,6 +19,7 @@ include:
   - services/drone/drone.yml
   - services/enshrouded.yml
   - services/7dtdserver.yml
+  - services/gluetun.yml
 
 services:
   caddy:

services/gluetun.yml

@@ -0,0 +1,39 @@
+---
+services:
+  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
+      networks:
+        public:
+          ipv4_address: 192.168.240.49
+      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=
+        # - OPENVPN_PASSWORD=
+        # Wireguard:
+        # - WIREGUARD_PRIVATE_KEY=wOEI9rqqbDwnN8/Bpp22sVz48T71vJ4fYmFWujulwUU=
+        # - WIREGUARD_ADDRESSES=10.64.222.21/32
+        # Timezone for accurate log times
+        - TZ=${TZ}
+        - SERVER_COUNTRIES=Japan
+        - HTTPPROXY=on
+        # Server list updater
+        # See https://github.com/qdm12/gluetun-wiki/blob/main/setup/servers.md#update-the-vpn-servers-list
+        - UPDATER_PERIOD=