From cd4ef26ed882e57431c93a4b13bfe49fb1ab95c2 Mon Sep 17 00:00:00 2001 From: kev Date: Sat, 2 Sep 2017 13:45:27 +0800 Subject: [PATCH] update fteproxy --- fteproxy/README.md | 24 ++++++++++++------------ fteproxy/docker-compose.yml | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fteproxy/README.md b/fteproxy/README.md index 38b2ff6..e9df06f 100644 --- a/fteproxy/README.md +++ b/fteproxy/README.md @@ -30,12 +30,12 @@ server: ports: - "80" environment: - - "MODE=server" - - "SERVER_IP=0.0.0.0" - - "SERVER_PORT=80" - - "PROXY_IP=www.google.com" - - "PROXY_PORT=80" - - "KEY=CB2FBA2BC70490526E749E01BB050F6B555964290DFF58CF24785B4A093F7B18" + - MODE=server + - SERVER_IP=0.0.0.0 + - SERVER_PORT=80 + - PROXY_IP=www.google.com + - PROXY_PORT=80 + - KEY=CB2FBA2BC70490526E749E01BB050F6B555964290DFF58CF24785B4A093F7B18 client: image: vimagick/fteproxy @@ -44,12 +44,12 @@ client: links: - server environment: - - "MODE=client" - - "SERVER_IP=server" - - "SERVER_PORT=80" - - "CLIENT_IP=0.0.0.0" - - "CLIENT_PORT=80" - - "KEY=CB2FBA2BC70490526E749E01BB050F6B555964290DFF58CF24785B4A093F7B18" + - MODE=client + - SERVER_IP=server + - SERVER_PORT=80 + - CLIENT_IP=0.0.0.0 + - CLIENT_PORT=80 + - KEY=CB2FBA2BC70490526E749E01BB050F6B555964290DFF58CF24785B4A093F7B18 ``` > To generate random key: diff --git a/fteproxy/docker-compose.yml b/fteproxy/docker-compose.yml index 7eb8463..ab28ec5 100644 --- a/fteproxy/docker-compose.yml +++ b/fteproxy/docker-compose.yml @@ -3,12 +3,12 @@ master: ports: - "4911:4911" external_links: - - openvpn_server_1:server + - openvpn_server_1:openvpn environment: - MODE=server - SERVER_IP=0.0.0.0 - SERVER_PORT=4911 - - PROXY_IP=server + - PROXY_IP=openvpn - PROXY_PORT=1194 - KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741 restart: always @@ -19,7 +19,7 @@ bridge: - "1194:1194" environment: - MODE=client - - SERVER_IP=vpn.easypi.info + - SERVER_IP=openvpn.easypi.pro - SERVER_PORT=4911 - CLIENT_IP=0.0.0.0 - CLIENT_PORT=1194