From 8025a0c81a38fa224c35a9dca6d40e1a1eac0c95 Mon Sep 17 00:00:00 2001 From: Pin Lin Date: Sat, 3 Nov 2018 00:00:51 +0800 Subject: [PATCH] Update VPN config --- README.md | 13 +++++++++---- docker-entrypoint.sh | 4 ++-- vpn.conf | 7 ------- 3 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 vpn.conf diff --git a/README.md b/README.md index 6df7007..0fdd512 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,16 @@ ## Usage ```bash -sudo docker run --cap-add=NET_ADMIN \ +sudo docker run --name gectunnel \ + --cap-add=NET_ADMIN \ --device=/dev/ppp \ --restart=always \ - -d \ - -p 65356:22 \ - --name gectunnel pinlin/gectunnel + -p 65356:22 -d \ + -e VPN_HOST='140.116.163.158:443' \ + -e VPN_CERT='14191abc008ac178756710c3e24df2051cc50475b04a973eb586d21fd8132207' \ + -e VPN_USERNAME='gec028B@gec2018.twisc.ncku.edu.tw' \ + -e VPN_PASSWORD='[hidden]' \ + -e SSH_HOST='192.168.80.240:22' \ + pinlin/gectunnel ``` diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 6159f38..4496ab0 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -2,7 +2,7 @@ while true do - openfortivpn -c vpn.conf + openfortivpn ${VPN_HOST} -u ${VPN_USERNAME} -p ${VPN_PASSWORD} --trusted-cert=${VPN_CERT} sleep 1s done & @@ -10,6 +10,6 @@ sleep 3s while true do - socat TCP-LISTEN:22,fork TCP:192.168.80.240:22 + socat TCP-LISTEN:22,fork TCP:${SSH_HOST} sleep 1s done \ No newline at end of file diff --git a/vpn.conf b/vpn.conf deleted file mode 100644 index b9b8397..0000000 --- a/vpn.conf +++ /dev/null @@ -1,7 +0,0 @@ -host = 140.116.163.158 -port = 443 -username = team01@gec2018.twisc.ncku.edu.tw -password = teama01 -set-routes = 1 -set-dns = 0 -trusted-cert = 14191abc008ac178756710c3e24df2051cc50475b04a973eb586d21fd8132207