From 4427f77a7dae809d95594993d496aab12ce6b9a1 Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 09:28:09 +0800 Subject: [PATCH 01/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6cd2fe8..6d0305a 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ proxy是golang实现的高性能http,https,websocket,tcp代理服务器.程序 提示:所有操作需要root权限. 0.如果你的VPS是linux64位的系统,那么只需要执行下面一句,就可以完成自动安装和配置. -#wget https://github.com/snail007/goproxy/blob/master/install_auto.sh -O - | sh +#curl -L https://github.com/snail007/goproxy/blob/master/install_auto.sh | bash 安装完成,配置目录是/etc/proxy,更详细的使用方法参考下面的进一步了解. 如果你的vps不是linux64位系统,请按照下面的半自动步骤安装: From f179ee746d929dc1b232c0a27437b24a71e111a7 Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 09:29:45 +0800 Subject: [PATCH 02/17] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 6d0305a..e0a1e32 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ proxy是golang实现的高性能http,https,websocket,tcp代理服务器.程序 提示:所有操作需要root权限. 0.如果你的VPS是linux64位的系统,那么只需要执行下面一句,就可以完成自动安装和配置. -#curl -L https://github.com/snail007/goproxy/blob/master/install_auto.sh | bash +#curl -L https://raw.githubusercontent.com/snail007/goproxy/master/install_auto.sh | bash 安装完成,配置目录是/etc/proxy,更详细的使用方法参考下面的进一步了解. 如果你的vps不是linux64位系统,请按照下面的半自动步骤安装: @@ -58,4 +58,3 @@ proxy是golang实现的高性能http,https,websocket,tcp代理服务器.程序 然后程序即可通过加密通道通过vps上网。 任何使用问题欢迎邮件交流：arraykeys@gmail.com - From 2de0596e6983d1f0bb9623414f2decef81a89673 Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 10:37:47 +0800 Subject: [PATCH 03/17] Update install.sh --- install.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index 61e59f7..6d56d84 100755 --- a/install.sh +++ b/install.sh @@ -1,13 +1,12 @@ #!/bin/bash # install monexec -tar zxvf monexec_*.tar.gz -cd monexec_* +tar zxvf monexec_0.1.1_linux_amd64.tar.gz +cd monexec_0.1.1_linux_amd64 cp monexec /usr/bin/ chmod +x /usr/bin/monexec - +cd .. # #install proxy -tar zxvf proxy-*.tar.gz -cd proxy-* +tar zxvf proxy-linux-amd64.tar.gz cp proxy /usr/bin/ cp proxyd /usr/bin/ chmod +x /usr/bin/proxy @@ -33,4 +32,4 @@ if [ ! -e /etc/proxy/direct ]; then fii echo "install done" -proxyd \ No newline at end of file +proxyd From 5a0944b54dad36f0eae74325e5bb4fe4e96abc49 Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 10:55:56 +0800 Subject: [PATCH 04/17] Update install_auto.sh --- install_auto.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/install_auto.sh b/install_auto.sh index 083c97e..3903d0d 100755 --- a/install_auto.sh +++ b/install_auto.sh @@ -4,17 +4,16 @@ rm -rf /tmp/proxy mkdir /tmp/proxy cd /tmp/proxy wget https://github.com/reddec/monexec/releases/download/v0.1.1/monexec_0.1.1_linux_amd64.tar.gz -wget https://github.com/snail007/goproxy/blob/master/release-2.0/proxy-linux-amd64.tar.gz +wget https://github.com/snail007/goproxy/releases/download/v2.0/proxy-linux-amd64.tar.gz # install monexec -tar zxvf monexec_*.tar.gz -cd monexec_* +tar zxvf monexec_0.1.1_linux_amd64.tar.gz +cd monexec_0.1.1_linux_amd64 cp monexec /usr/bin/ chmod +x /usr/bin/monexec # #install proxy -tar zxvf proxy-*.tar.gz -cd proxy-* +tar zxvf proxy-linux-amd64.tar.gz cp proxy /usr/bin/ cp proxyd /usr/bin/ chmod +x /usr/bin/proxy @@ -29,4 +28,4 @@ if [ ! -e /etc/proxy/proxy.crt ]; then proxy keygen >/dev/null 2>&1 fi echo "install done" -proxyd \ No newline at end of file +proxyd From 37734ec6bde725512aecbd78b714ac57ec7b6559 Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 10:56:15 +0800 Subject: [PATCH 05/17] Update install_auto.sh --- install_auto.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install_auto.sh b/install_auto.sh index 3903d0d..4e2bbc9 100755 --- a/install_auto.sh +++ b/install_auto.sh @@ -27,5 +27,6 @@ if [ ! -e /etc/proxy/proxy.crt ]; then cd /etc/proxy/ proxy keygen >/dev/null 2>&1 fi +rm -rf /tmp/proxy echo "install done" proxyd From f7ef3048e74944ece3ed124c4a4337134c5ce93a Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 10:56:52 +0800 Subject: [PATCH 06/17] Update install.sh --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 6d56d84..8df558d 100755 --- a/install.sh +++ b/install.sh @@ -30,6 +30,6 @@ if [ ! -e /etc/proxy/direct ]; then cd /etc/proxy/ cp direct /etc/proxy/ fii - +rm -rf /tmp/proxy echo "install done" proxyd From 4c1b40c99447778d9e0448c52786eb29962b5d6f Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 10:57:35 +0800 Subject: [PATCH 07/17] Update install_auto.sh --- install_auto.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_auto.sh b/install_auto.sh index 4e2bbc9..e6bba53 100755 --- a/install_auto.sh +++ b/install_auto.sh @@ -11,7 +11,7 @@ tar zxvf monexec_0.1.1_linux_amd64.tar.gz cd monexec_0.1.1_linux_amd64 cp monexec /usr/bin/ chmod +x /usr/bin/monexec - +cd .. # #install proxy tar zxvf proxy-linux-amd64.tar.gz cp proxy /usr/bin/ From 6bce1c79d876f440c90dec56927d809b49fe7c5f Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 11:00:44 +0800 Subject: [PATCH 08/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e0a1e32..5873f03 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ proxy是golang实现的高性能http,https,websocket,tcp代理服务器.程序 提示:所有操作需要root权限. 0.如果你的VPS是linux64位的系统,那么只需要执行下面一句,就可以完成自动安装和配置. -#curl -L https://raw.githubusercontent.com/snail007/goproxy/master/install_auto.sh | bash +#curl -s -L https://raw.githubusercontent.com/snail007/goproxy/master/install_auto.sh | bash 安装完成,配置目录是/etc/proxy,更详细的使用方法参考下面的进一步了解. 如果你的vps不是linux64位系统,请按照下面的半自动步骤安装: From 8570d74009a7df548c84b1c09f0353f41ad7c695 Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 11:11:06 +0800 Subject: [PATCH 09/17] Update install_auto.sh --- install_auto.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install_auto.sh b/install_auto.sh index e6bba53..c4b657d 100755 --- a/install_auto.sh +++ b/install_auto.sh @@ -27,6 +27,7 @@ if [ ! -e /etc/proxy/proxy.crt ]; then cd /etc/proxy/ proxy keygen >/dev/null 2>&1 fi +cd .. rm -rf /tmp/proxy echo "install done" proxyd From 79dcce67c0caece2f0ffa0baaf604de8f196b48c Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 11:13:02 +0800 Subject: [PATCH 10/17] Update install.sh --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 8df558d..4d55d20 100755 --- a/install.sh +++ b/install.sh @@ -29,7 +29,7 @@ fi if [ ! -e /etc/proxy/direct ]; then cd /etc/proxy/ cp direct /etc/proxy/ -fii +fi rm -rf /tmp/proxy echo "install done" proxyd From 54c7f889185a44533806d93b60d1a064951bf563 Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 11:13:43 +0800 Subject: [PATCH 11/17] Update install_auto.sh --- install_auto.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/install_auto.sh b/install_auto.sh index c4b657d..e6bba53 100755 --- a/install_auto.sh +++ b/install_auto.sh @@ -27,7 +27,6 @@ if [ ! -e /etc/proxy/proxy.crt ]; then cd /etc/proxy/ proxy keygen >/dev/null 2>&1 fi -cd .. rm -rf /tmp/proxy echo "install done" proxyd From 5c0c51d23d33dd9eb05493bb59cbc8b9c7cc4a08 Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 11:16:38 +0800 Subject: [PATCH 12/17] Update install_auto.sh --- install_auto.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/install_auto.sh b/install_auto.sh index e6bba53..1d96ecf 100755 --- a/install_auto.sh +++ b/install_auto.sh @@ -1,7 +1,8 @@ #!/bin/bash - -rm -rf /tmp/proxy -mkdir /tmp/proxy +set -e +if [ -e /tmp/proxy ]; then + rm -rf /tmp/proxy +fi cd /tmp/proxy wget https://github.com/reddec/monexec/releases/download/v0.1.1/monexec_0.1.1_linux_amd64.tar.gz wget https://github.com/snail007/goproxy/releases/download/v2.0/proxy-linux-amd64.tar.gz From e60152698076182c1336681a401aa6b917378a19 Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 11:17:09 +0800 Subject: [PATCH 13/17] Update install.sh --- install.sh | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/install.sh b/install.sh index 4d55d20..e026c46 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,12 @@ #!/bin/bash +set -e +if [ -e /tmp/proxy ]; then + rm -rf /tmp/proxy +fi +cd /tmp/proxy # install monexec tar zxvf monexec_0.1.1_linux_amd64.tar.gz -cd monexec_0.1.1_linux_amd64 +cd monexec_0.1.1_linux_amd64 cp monexec /usr/bin/ chmod +x /usr/bin/monexec cd .. @@ -20,16 +25,6 @@ if [ ! -e /etc/proxy/proxy.crt ]; then cd /etc/proxy/ proxy keygen >/dev/null 2>&1 fi - -if [ ! -e /etc/proxy/blocked ]; then - cd /etc/proxy/ - cp blocked /etc/proxy/ -fi - -if [ ! -e /etc/proxy/direct ]; then - cd /etc/proxy/ - cp direct /etc/proxy/ -fi rm -rf /tmp/proxy echo "install done" proxyd From 84a5a087534bbe6b18442a033727e4298d7e68c5 Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 11:17:37 +0800 Subject: [PATCH 14/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5873f03..e0a1e32 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ proxy是golang实现的高性能http,https,websocket,tcp代理服务器.程序 提示:所有操作需要root权限. 0.如果你的VPS是linux64位的系统,那么只需要执行下面一句,就可以完成自动安装和配置. -#curl -s -L https://raw.githubusercontent.com/snail007/goproxy/master/install_auto.sh | bash +#curl -L https://raw.githubusercontent.com/snail007/goproxy/master/install_auto.sh | bash 安装完成,配置目录是/etc/proxy,更详细的使用方法参考下面的进一步了解. 如果你的vps不是linux64位系统,请按照下面的半自动步骤安装: From 14987b5a741af2c0613a5846bb22526eec279ed0 Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 11:18:32 +0800 Subject: [PATCH 15/17] Update install_auto.sh --- install_auto.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install_auto.sh b/install_auto.sh index 1d96ecf..6f8e024 100755 --- a/install_auto.sh +++ b/install_auto.sh @@ -3,6 +3,7 @@ set -e if [ -e /tmp/proxy ]; then rm -rf /tmp/proxy fi +mkdir /tmp/proxy cd /tmp/proxy wget https://github.com/reddec/monexec/releases/download/v0.1.1/monexec_0.1.1_linux_amd64.tar.gz wget https://github.com/snail007/goproxy/releases/download/v2.0/proxy-linux-amd64.tar.gz From e71d2203d8b00fde1244a266282e1e46dc711d1a Mon Sep 17 00:00:00 2001 From: snail007 Date: Tue, 12 Sep 2017 11:22:11 +0800 Subject: [PATCH 16/17] Update install.sh a --- install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sh b/install.sh index e026c46..f11ccc3 100755 --- a/install.sh +++ b/install.sh @@ -3,6 +3,7 @@ set -e if [ -e /tmp/proxy ]; then rm -rf /tmp/proxy fi +mkdir /tmp/proxy cd /tmp/proxy # install monexec tar zxvf monexec_0.1.1_linux_amd64.tar.gz From 1cd3ab7be4c9f9cc77aa295f944ca79a9ee99343 Mon Sep 17 00:00:00 2001 From: snail007 Date: Wed, 13 Sep 2017 14:53:53 +0800 Subject: [PATCH 17/17] Update install_auto.sh --- install_auto.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_auto.sh b/install_auto.sh index 6f8e024..48a5647 100755 --- a/install_auto.sh +++ b/install_auto.sh @@ -6,7 +6,7 @@ fi mkdir /tmp/proxy cd /tmp/proxy wget https://github.com/reddec/monexec/releases/download/v0.1.1/monexec_0.1.1_linux_amd64.tar.gz -wget https://github.com/snail007/goproxy/releases/download/v2.0/proxy-linux-amd64.tar.gz +wget https://github.com/snail007/goproxy/releases/download/v2.1/proxy-linux-amd64.tar.gz # install monexec tar zxvf monexec_0.1.1_linux_amd64.tar.gz