Revert "Update latest config file's fields"
This commit is contained in:
parent
adc1f97f38
commit
21aedcfc40
|
|
@ -84,17 +84,11 @@ function download_files(){
|
||||||
echo "ez_setup.py [found]"
|
echo "ez_setup.py [found]"
|
||||||
else
|
else
|
||||||
echo "ez_setup.py not found!!!download now......"
|
echo "ez_setup.py not found!!!download now......"
|
||||||
if ! wget --no-check-certificate https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py; then
|
if ! wget --no-check-certificate https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py;then
|
||||||
echo "Failed to download ez_setup.py!"
|
echo "Failed to download ez_setup.py!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
# Download chkconfig file
|
|
||||||
echo "download shadowsocks chkconfig file......"
|
|
||||||
if ! wget --no-check-certificate https://raw.githubusercontent.com/teddysun/shadowsocks_install/master/shadowsocks; then
|
|
||||||
echo "Failed to download shadowsocks chkconfig file!"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Config shadowsocks
|
# Config shadowsocks
|
||||||
|
|
@ -128,6 +122,7 @@ function iptables_set(){
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# Install
|
# Install
|
||||||
function install(){
|
function install(){
|
||||||
which pip > /dev/null 2>&1
|
which pip > /dev/null 2>&1
|
||||||
|
|
@ -142,12 +137,7 @@ function install(){
|
||||||
pip install shadowsocks
|
pip install shadowsocks
|
||||||
if [ -f /usr/bin/ssserver ]; then
|
if [ -f /usr/bin/ssserver ]; then
|
||||||
# Run shadowsocks in the background
|
# Run shadowsocks in the background
|
||||||
mv shadowsocks /etc/init.d/
|
nohup ssserver -c /etc/shadowsocks.json > /dev/null 2>&1 &
|
||||||
chmod +x /etc/init.d/shadowsocks
|
|
||||||
# Add run on system start up
|
|
||||||
chkconfig --add shadowsocks
|
|
||||||
chkconfig shadowsocks on
|
|
||||||
/etc/init.d/shadowsocks start
|
|
||||||
sleep 1
|
sleep 1
|
||||||
# Run success or not
|
# Run success or not
|
||||||
ps -ef | grep -v grep | grep -v ps | grep -i '/usr/bin/python /usr/bin/ssserver' > /dev/null 2>&1
|
ps -ef | grep -v grep | grep -v ps | grep -i '/usr/bin/python /usr/bin/ssserver' > /dev/null 2>&1
|
||||||
|
|
@ -156,6 +146,12 @@ function install(){
|
||||||
else
|
else
|
||||||
echo "Shadowsocks start failure!"
|
echo "Shadowsocks start failure!"
|
||||||
fi
|
fi
|
||||||
|
# Add run on system start up
|
||||||
|
cat /etc/rc.d/rc.local | grep 'ssserver' > /dev/null 2>&1
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
cp /etc/rc.d/rc.local /etc/rc.d/rc.local.bak
|
||||||
|
echo "nohup /usr/bin/python /usr/bin/ssserver -c /etc/shadowsocks.json > /dev/null 2>&1 &" >> /etc/rc.d/rc.local
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo ""
|
echo ""
|
||||||
echo "Shadowsocks install failed! Please visit http://teddysun.com/342.html and contact."
|
echo "Shadowsocks install failed! Please visit http://teddysun.com/342.html and contact."
|
||||||
|
|
@ -195,8 +191,10 @@ function uninstall_shadowsocks(){
|
||||||
fi
|
fi
|
||||||
# delete config file
|
# delete config file
|
||||||
rm -f /etc/shadowsocks.json
|
rm -f /etc/shadowsocks.json
|
||||||
rm -f /var/run/shadowsocks.pid
|
if [ -f /etc/rc.d/rc.local.bak ];then
|
||||||
rm -f /etc/init.d/shadowsocks
|
rm -f /etc/rc.d/rc.local
|
||||||
|
mv /etc/rc.d/rc.local.bak /etc/rc.d/rc.local
|
||||||
|
fi
|
||||||
pip uninstall -y shadowsocks
|
pip uninstall -y shadowsocks
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo "Shadowsocks uninstall success!"
|
echo "Shadowsocks uninstall success!"
|
||||||
|
|
@ -219,4 +217,4 @@ uninstall)
|
||||||
echo "Arguments error! [${action} ]"
|
echo "Arguments error! [${action} ]"
|
||||||
echo "Usage: `basename $0` {install|uninstall}"
|
echo "Usage: `basename $0` {install|uninstall}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user