diff --git a/README.md b/README.md index 633cea4..7a3a2a3 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ http,tcp,udp代理过程会和上级通讯,为了安全我们采用加密通讯, **1.7.查看帮助** `./proxy help http` -[图文教程](docs/faststart_v3.md) + ### 2.TCP代理 diff --git a/install.sh b/install.sh index f11ccc3..75d023e 100755 --- a/install.sh +++ b/install.sh @@ -14,12 +14,11 @@ cd .. # #install proxy tar zxvf proxy-linux-amd64.tar.gz cp proxy /usr/bin/ -cp proxyd /usr/bin/ chmod +x /usr/bin/proxy -chmod +x /usr/bin/proxyd if [ ! -e /etc/proxy ]; then mkdir /etc/proxy - cp proxy.toml /etc/proxy/ + cp blocked /etc/proxy + cp direct /etc/proxy fi if [ ! -e /etc/proxy/proxy.crt ]; then @@ -28,4 +27,4 @@ if [ ! -e /etc/proxy/proxy.crt ]; then fi rm -rf /tmp/proxy echo "install done" -proxyd +proxy help diff --git a/install_auto.sh b/install_auto.sh index e76f4a5..4fa322c 100755 --- a/install_auto.sh +++ b/install_auto.sh @@ -17,12 +17,11 @@ cd .. # #install proxy tar zxvf proxy-linux-amd64.tar.gz cp proxy /usr/bin/ -cp proxyd /usr/bin/ chmod +x /usr/bin/proxy -chmod +x /usr/bin/proxyd if [ ! -e /etc/proxy ]; then mkdir /etc/proxy - cp proxy.toml /etc/proxy/ + cp blocked /etc/proxy + cp direct /etc/proxy fi if [ ! -e /etc/proxy/proxy.crt ]; then @@ -31,4 +30,4 @@ if [ ! -e /etc/proxy/proxy.crt ]; then fi rm -rf /tmp/proxy echo "install done" -proxyd +proxy help diff --git a/proxyd b/proxyd deleted file mode 100755 index 5f49778..0000000 --- a/proxyd +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -PID="/var/run/proxy.pid" -NAME="proxy" -case "$1" in -start) - if [ -e ${PID} ]; then - echo ${NAME} is running, pid=`cat ${PID}`, please stop first - exit 1 - else - monexec run -w /etc/proxy -- proxy >/dev/null 2>&1 & - echo $!>${PID} - fi - ;; -stop) - if [ -e ${PID} ]; then - kill `cat ${PID}` - rm ${PID} - fi - ;; -restart) - $0 stop - $0 start - ;; -status) - if [ -e ${PID} ]; then - echo ${NAME} is running, pid=`cat ${PID}` - else - echo ${NAME} is NOT running - exit 1 - fi - ;; -*) - echo "Usage: $0 {start|stop|status|restart}" -esac - -exit 0 \ No newline at end of file