Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduce support for upgrading dependencies; Change mbedtls_url to the Github source; Make Shadowsocks-libev be the preferred option #119

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Introduce support for upgrading dependencies; Change mbedtls_url to the Github source; Make Shadowsocks-libev be the preferred option #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8a1028b
Revert "Update comments"
IceCodeNew Jul 3, 2020
9a455e0
use `[[ … ]]` rather than `[ … ]`
IceCodeNew Jul 3, 2020
15a2c7e
fix SC2196
IceCodeNew Jul 6, 2020
839b04d
Introduce support for upgrading dependencies
IceCodeNew Jul 3, 2020
6becfa7
fix SC2162
IceCodeNew Jul 3, 2020
d69ddf0
Change `mbedtls_url` to the Github source; fix SC2181
IceCodeNew Jul 3, 2020
2f666cf
Adapt for archive structures from GitHub source
IceCodeNew Jul 3, 2020
0fc3dd9
In case someone is trying to install shadowsocks on a machine with ve…
IceCodeNew Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions haproxy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ check_sys() {
local release=''
local systemPackage=''

if [ -f /etc/redhat-release ]; then
if [[ -f /etc/redhat-release ]]; then
release="centos"
systemPackage="yum"
elif cat /etc/issue | grep -Eqi "debian"; then
Expand All @@ -52,14 +52,14 @@ check_sys() {
systemPackage="yum"
fi

if [ ${checkType} == "sysRelease" ]; then
if [ "$value" == "$release" ]; then
if [[ ${checkType} == "sysRelease" ]]; then
if [[ "$value" == "$release" ]]; then
return 0
else
return 1
fi
elif [ ${checkType} == "packageManager" ]; then
if [ "$value" == "$systemPackage" ]; then
elif [[ ${checkType} == "packageManager" ]]; then
if [[ "$value" == "$systemPackage" ]]; then
return 0
else
return 1
Expand All @@ -76,7 +76,7 @@ install_check() {
}

disable_selinux(){
if [ -s /etc/selinux/config ] && grep 'SELINUX=enforcing' /etc/selinux/config; then
if [[ -s /etc/selinux/config ]] && grep 'SELINUX=enforcing' /etc/selinux/config; then
sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/selinux/config
setenforce 0
fi
Expand All @@ -97,10 +97,10 @@ valid_ip(){
}

get_ip(){
local IP=$( ip addr | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | egrep -v "^192\.168|^172\.1[6-9]\.|^172\.2[0-9]\.|^172\.3[0-2]\.|^10\.|^127\.|^255\.|^0\." | head -n 1 )
[ -z ${IP} ] && IP=$( wget -qO- -t1 -T2 ipv4.icanhazip.com )
[ -z ${IP} ] && IP=$( wget -qO- -t1 -T2 ipinfo.io/ip )
[ ! -z ${IP} ] && echo ${IP} || echo
local IP=$( ip addr | grep -E -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -E -v "^192\.168|^172\.1[6-9]\.|^172\.2[0-9]\.|^172\.3[0-2]\.|^10\.|^127\.|^255\.|^0\." | head -n 1 )
[[ -z ${IP} ]] && IP=$( wget -qO- -t1 -T2 ipv4.icanhazip.com )
[[ -z ${IP} ]] && IP=$( wget -qO- -t1 -T2 ipinfo.io/ip )
[[ ! -z ${IP} ]] && echo ${IP} || echo
}

get_char(){
Expand All @@ -125,11 +125,11 @@ pre_install(){
while true
do
echo -e "Please enter a port for haproxy and Shadowsocks server [1-65535]"
read -p "(Default port: 8989):" haproxyport
[ -z "${haproxyport}" ] && haproxyport="8989"
read -rp "(Default port: 8989):" haproxyport
[[ -z "${haproxyport}" ]] && haproxyport="8989"
expr ${haproxyport} + 0 &>/dev/null
if [ $? -eq 0 ]; then
if [ ${haproxyport} -ge 1 ] && [ ${haproxyport} -le 65535 ]; then
if [[ $? -eq 0 ]]; then
if [[ ${haproxyport} -ge 1 ]] && [[ ${haproxyport} -le 65535 ]]; then
echo
echo "---------------------------"
echo "port = ${haproxyport}"
Expand All @@ -148,9 +148,9 @@ pre_install(){
while :
do
echo -e "Please enter your Shadowsocks server's IPv4 address for haproxy"
read -p "(IPv4 is):" haproxyip
read -rp "(IPv4 is):" haproxyip
valid_ip ${haproxyip}
if [ $? -eq 0 ]; then
if [[ $? -eq 0 ]]; then
echo
echo "---------------------------"
echo "IP = ${haproxyip}"
Expand All @@ -177,7 +177,7 @@ config_haproxy(){
echo "nameserver 8.8.4.4" >> /etc/resolv.conf
fi

if [ -f /etc/haproxy/haproxy.cfg ]; then
if [[ -f /etc/haproxy/haproxy.cfg ]]; then
cp -p /etc/haproxy/haproxy.cfg /etc/haproxy/haproxy.cfg.bak
fi

Expand Down Expand Up @@ -216,7 +216,7 @@ install(){
apt-get install -y haproxy
fi

if [ -d /etc/haproxy ]; then
if [[ -d /etc/haproxy ]]; then
echo "haproxy install success."

echo "Config haproxy start..."
Expand All @@ -232,7 +232,7 @@ install(){

# Start haproxy
service haproxy start
if [ $? -eq 0 ]; then
if [[ $? -eq 0 ]]; then
echo "haproxy start success..."
else
echo "haproxy start failure..."
Expand Down
Loading