diff --git a/README.md b/README.md index 9b0f025..afdefa1 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ dockerfiles - [x] nginx - [x] obfsproxy - [x] opencart +- [x] openvpn :+1: - [x] pdnsd - [x] phantomjs - [x] phpbb @@ -73,7 +74,6 @@ dockerfiles - [x] ghost - [x] gitlab - [x] logspout -- [x] openvpn - [x] owncloud - [x] registrator - [x] rocket.chat diff --git a/openvpn/README.md b/openvpn/README.md new file mode 100644 index 0000000..3fa0ee2 --- /dev/null +++ b/openvpn/README.md @@ -0,0 +1,93 @@ +openvpn +======= + +![](https://badge.imagelayers.io/vimagick/openvpn:latest.svg) + +OpenVPN is blocked in China. You need to connect vpn via secure tunnel. + +- server: vpn.datageek.info +- bridge: bridge.datageek.info +- client: localhost + +## docker-compose.yml (server) + +``` +data: + image: busybox + volumes: + - /etc/openvpn + +server: + image: vimagick/openvpn + expose: + - "1194/tcp" + volumes_from: + - data + cap_add: + - NET_ADMIN + restart: always + +fteproxy: + image: vimagick/fteproxy + ports: + - "4911:4911" + links: + - "server" + environment: + - "MODE=server" + - "SERVER_IP=0.0.0.0" + - "SERVER_PORT=4911" + - "PROXY_IP=server" + - "PROXY_PORT=1194" + - "KEY=CB2FBA2BC70490526E749E01BB050F6B555964290DFF58CF24785B4A093F7B18" + restart: always +``` + +## docker-compose.yml (bridge) + +``` +fteproxy: + image: vimagick/fteproxy + ports: + - "1194:1194" + environment: + - "MODE=client" + - "SERVER_IP=vpn.datageek.info" + - "SERVER_PORT=4911" + - "CLIENT_IP=0.0.0.0" + - "CLIENT_PORT=1194" + - "KEY=CB2FBA2BC70490526E749E01BB050F6B555964290DFF58CF24785B4A093F7B18" + restart: always +``` + +## server + +``` +$ fig up -d data + +$ ./setup.sh +1) server +2) client +3) backup +4) quit + +$ fig up -d +``` + +## bridge + +``` +$ fig up -d +``` + +## client + +``` +$ cat /etc/openvpn/client.conf +... +remote bridge.datageek.info 1194 tcp +route 192.168.1.0 255.255.255.0 net_gateway +... +$ systemctl start openvpn@client +$ systemctl enable openvpn@client +``` diff --git a/openvpn/docker-compose.yml b/openvpn/docker-compose.yml index f7831db..a37cc82 100644 --- a/openvpn/docker-compose.yml +++ b/openvpn/docker-compose.yml @@ -4,44 +4,26 @@ data: - /etc/openvpn server: - image: kylemanna/openvpn - ports: - - "1194:1194/tcp" + image: vimagick/openvpn + expose: + - "1194/tcp" volumes_from: - data cap_add: - NET_ADMIN restart: always -################################### SERVER ################################### -# -#fteproxy: -# image: vimagick/fteproxy -# ports: -# - "4911:4911" -# links: -# - "server" -# environment: -# - "MODE=server" -# - "SERVER_IP=0.0.0.0" -# - "SERVER_PORT=4911" -# - "PROXY_IP=server" -# - "PROXY_PORT=1194" -# - "KEY=0000000000000000000000000000000000000000000000000000000000000000" -# - -################################### CLIENT ################################### -# -#fteproxy: -# image: vimagick/fteproxy -# ports: -# - "1194:1194" -# environment: -# - "MODE=client" -# - "SERVER_IP=vpn.datageek.info" -# - "SERVER_PORT=4911" -# - "CLIENT_IP=0.0.0.0" -# - "CLIENT_PORT=1194" -# - "KEY=0000000000000000000000000000000000000000000000000000000000000000" -# restart: always -# +fteproxy: + image: vimagick/fteproxy + ports: + - "4911:4911" + links: + - "server" + environment: + - "MODE=server" + - "SERVER_IP=0.0.0.0" + - "SERVER_PORT=4911" + - "PROXY_IP=server" + - "PROXY_PORT=1194" + - "KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741" + restart: always diff --git a/openvpn/setup.sh b/openvpn/setup.sh index 0ec0c86..fd7f1f0 100755 --- a/openvpn/setup.sh +++ b/openvpn/setup.sh @@ -1,10 +1,10 @@ #!/bin/bash # -# setup script for kylemanna/openvpn +# setup script for vimagick/openvpn # OVPN_DIR=./ovpn -OVPN_IMG=kylemanna/openvpn +OVPN_IMG=vimagick/openvpn OVPN_DATA=openvpn_data_1 OVPN_SERVER=tcp://vpn.datageek.info @@ -35,4 +35,3 @@ do echo "invalid" fi done -