From c68ec26d588183840d9e5319b5bff7655beaf3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= <lukas@kucharczyk.xyz>
Date: Fri, 8 Nov 2024 21:50:31 +0100
Subject: [PATCH] gluetun: fix formatting, assign ip, turn on http proxy

---
 services/gluetun.yml | 71 ++++++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/services/gluetun.yml b/services/gluetun.yml
index ce2f636..083d4e1 100644
--- a/services/gluetun.yml
+++ b/services/gluetun.yml
@@ -1,34 +1,39 @@
 ---
-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
+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=
\ No newline at end of file