From 9ee7dacddab3f982a389d49888278a9f2ff4e1b6 Mon Sep 17 00:00:00 2001
From: Junv Zhao <wahyd4@gmail.com>
Date: Fri, 16 Aug 2019 20:25:06 +1000
Subject: [PATCH] add vpn service

---
 aria2-bundle/docker-compose.yml | 30 +-----------------------------
 vpn/docker-compose.yaml         | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 29 deletions(-)
 create mode 100644 vpn/docker-compose.yaml

diff --git a/aria2-bundle/docker-compose.yml b/aria2-bundle/docker-compose.yml
index c2e3e90..146b1f8 100644
--- a/aria2-bundle/docker-compose.yml
+++ b/aria2-bundle/docker-compose.yml
@@ -1,33 +1,5 @@
 version: "3.5"
 services:
-  pia:
-    image: qmcgaw/private-internet-access:latest
-    container_name: pia
-    cap_add:
-      - NET_ADMIN
-    devices:
-      - /dev/net/tun
-    network_mode: bridge
-    # ports:
-    #   - 8888:8888/tcp
-    environment:
-      - USER=p1787216
-      - PASSWORD=4Jpywa5Jmg
-      - ENCRYPTION=strong
-      - PROTOCOL=udp
-      - REGION=AU Melbourne
-      - NONROOT=no
-      - DOT=on
-      - BLOCK_MALICIOUS=on
-      - BLOCK_NSA=off
-      - UNBLOCK=
-      - FIREWALL=on
-      - EXTRA_SUBNETS=
-      - PROXY=on
-      - PROXY_LOG_LEVEL=Critical
-      - PROXY_USER=
-      - PROXY_PASSWORD=
-    restart: always
   aria2-ui:
     restart: unless-stopped
     image: wahyd4/aria2-ui:latest
@@ -38,9 +10,9 @@ services:
       - LETSENCRYPT_HOST=aria.home.toozhao.com
       - VIRTUAL_HOST=aria.home.toozhao.com
       - LETSENCRYPT_EMAIL=me@toozhao.com
-    network_mode: "service:pia"
     networks:
       - gateway_default
+      - "container:pia"
     volumes:
       - /data:/data
       - /home/junv/filebrowser.db:/app/filebrowser.db
diff --git a/vpn/docker-compose.yaml b/vpn/docker-compose.yaml
new file mode 100644
index 0000000..580b3eb
--- /dev/null
+++ b/vpn/docker-compose.yaml
@@ -0,0 +1,30 @@
+version: "3.5"
+services:
+  pia:
+    image: qmcgaw/private-internet-access:latest
+    container_name: pia
+    cap_add:
+      - NET_ADMIN
+    devices:
+      - /dev/net/tun
+    network_mode: bridge
+    # ports:
+    #   - 8888:8888/tcp
+    environment:
+      - USER=p1787216
+      - PASSWORD=4Jpywa5Jmg
+      - ENCRYPTION=strong
+      - PROTOCOL=udp
+      - REGION=AU Melbourne
+      - NONROOT=no
+      - DOT=on
+      - BLOCK_MALICIOUS=on
+      - BLOCK_NSA=off
+      - UNBLOCK=
+      - FIREWALL=on
+      - EXTRA_SUBNETS=
+      - PROXY=on
+      - PROXY_LOG_LEVEL=Critical
+      - PROXY_USER=
+      - PROXY_PASSWORD=
+    restart: always