update docker-compose.yml

README.md

@@ -182,6 +182,7 @@ A collection of delicious docker recipes.
 - [x] openconnect-arm
 - [x] openvpn-arm
 - [x] pptp
+- [x] pptp-arm
 - [x] pptpd
 - [x] shadowvpn
 - [x] strongswan :+1:

fteproxy/docker-compose.yml

@@ -1,23 +1,27 @@
-server:
+master:
   image: vimagick/fteproxy
   ports:
-    - "80"
+    - "4911:4911"
+  external_links:
+    - openvpn_server_1:server
   environment:
-    - "MODE=server"
+    - MODE=server
-    - "SERVER_IP=0.0.0.0"
+    - SERVER_IP=0.0.0.0
-    - "SERVER_PORT=80"
+    - SERVER_PORT=4911
-    - "PROXY_IP=www.google.com"
+    - PROXY_IP=server
-    - "PROXY_PORT=80"
+    - PROXY_PORT=1194
+    - KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741
+  restart: always
 
-client:
+bridge:
   image: vimagick/fteproxy
   ports:
-    - "9009:80"
+    - "1194:1194"
-  links:
-    - server
   environment:
-    - "MODE=client"
+    - MODE=client
-    - "SERVER_IP=server"
+    - SERVER_IP=vpn.easypi.info
-    - "SERVER_PORT=80"
+    - SERVER_PORT=4911
-    - "CLIENT_IP=0.0.0.0"
+    - CLIENT_IP=0.0.0.0
-    - "CLIENT_PORT=80"
+    - CLIENT_PORT=1194
+    - KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741
+  restart: always

openvpn/arm/docker-compose.yml

@@ -3,7 +3,19 @@ openvpn:
   command: --config pi.ovpn
   volumes:
     - ./data:/etc/openvpn
-  cap_add:
-    - NET_ADMIN
   net: host
+  privileged: yes
+  restart: always
+
+stunnel:
+  image: easypi/stunnel-arm
+  ports:
+    - "1194:1194"
+  environment:
+    - CLIENT=yes
+    - SERVICE=openvpn
+    - ACCEPT=0.0.0.0:1194
+    - CONNECT=server:4911
+  extra_hosts:
+    - server:1.2.3.4
   restart: always

openvpn/docker-compose.yml

@@ -13,36 +13,15 @@ server:
     - NET_ADMIN
   restart: always
 
-################################### SERVER ###################################
+stunnel:
-
+  image: vimagick/stunnel
-fteproxy:
-  image: vimagick/fteproxy
   ports:
     - "4911:4911"
   links:
     - server
   environment:
-    - MODE=server
+    - CLIENT=no
-    - SERVER_IP=0.0.0.0
+    - SERVICE=openvpn
-    - SERVER_PORT=4911
+    - ACCEPT=0.0.0.0:4911
-    - PROXY_IP=server
+    - CONNECT=server:1194
-    - PROXY_PORT=1194
-    - KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741
   restart: always
-
-################################### CLIENT ###################################
-#
-#fteproxy:
-#  image: vimagick/fteproxy
-#  ports:
-#    - "1194:1194"
-#  environment:
-#    - MODE=client
-#    - SERVER_IP=vpn.easypi.info
-#    - SERVER_PORT=4911
-#    - CLIENT_IP=0.0.0.0
-#    - CLIENT_PORT=1194
-#    - KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741
-#  restart: always
-#
-##############################################################################