From 4a170ba1beceac5c1fde7533c6344c0edb396a8a Mon Sep 17 00:00:00 2001
From: Toyo <toyo13140010096@gmail.com>
Date: Sat, 12 Aug 2017 13:12:31 +0800
Subject: [PATCH] =?UTF-8?q?#=20v1.0.4=20=E4=BF=AE=E5=A4=8D=20CentOS?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=B3=BB=E7=BB=9F=E6=9C=8D=E5=8A=A1=E4=B8=BA?=
 =?UTF-8?q?systemctl=E5=AF=BC=E8=87=B4=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 haproxy.sh | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/haproxy.sh b/haproxy.sh
index 330e3486..0c203944 100644
--- a/haproxy.sh
+++ b/haproxy.sh
@@ -5,7 +5,7 @@ export PATH
 #=================================================
 #	System Required: CentOS/Debian/Ubuntu
 #	Description: HaProxy
-#	Version: 1.0.3
+#	Version: 1.0.4
 #	Author: Toyo
 #	Blog: https://doub.io/wlzy-19/
 #=================================================
@@ -83,9 +83,14 @@ installHaProxy(){
 	else
 		Set_iptables
 		if [[ ${release}  == "centos" ]]; then
-			chmod +x /etc/init.d/haproxy
-			chkconfig --add haproxy
-			chkconfig haproxy on
+			cat /etc/redhat-release |grep 7\..*|grep -i centos>/dev/null
+			if [[ $? = 0 ]]; then
+				systemctl enable haproxy.service
+			else
+				chmod +x /etc/init.d/haproxy
+				chkconfig --add haproxy
+				chkconfig haproxy on
+			fi
 		else
 			chmod +x /etc/init.d/haproxy
 			update-rc.d -f haproxy defaults
@@ -173,7 +178,16 @@ startHaProxy(){
 # 判断进程是否存在
 	PID=`ps -ef | grep "haproxy" | grep -v grep | grep -v "haproxy.sh" | awk '{print $2}'`
 	[[ ! -z $PID ]] && echo -e "\033[41;37m [错误] \033[0m 发现 HaProxy 正在运行，请检查 !" && exit 1
-	/etc/init.d/haproxy start
+	if [[ ${release}  == "centos" ]]; then
+		cat /etc/redhat-release |grep 7\..*|grep -i centos>/dev/null
+		if [[ $? = 0 ]]; then
+			systemctl start haproxy.service
+		else
+			/etc/init.d/haproxy start
+		fi
+	else
+		/etc/init.d/haproxy start
+	fi
 	sleep 2s
 	PID=`ps -ef | grep "haproxy" | grep -v grep | grep -v "haproxy.sh" | awk '{print $2}'`
 	[[ -z $PID ]] && echo -e "\033[41;37m [错误] \033[0m HaProxy 启动失败 !" && exit 1
@@ -206,7 +220,16 @@ stopHaProxy(){
 		HaProxy_port_1=`echo ${HaProxy_port_1} | sed 's/-/:/g'`
 		iptables -D INPUT -p tcp --dport ${HaProxy_port_1} -j ACCEPT
 	fi
-	/etc/init.d/haproxy stop
+	if [[ ${release}  == "centos" ]]; then
+		cat /etc/redhat-release |grep 7\..*|grep -i centos>/dev/null
+		if [[ $? = 0 ]]; then
+			systemctl stop haproxy.service
+		else
+			/etc/init.d/haproxy stop
+		fi
+	else
+		/etc/init.d/haproxy stop
+	fi
 	sleep 2s
 	PID=`ps -ef | grep "haproxy" | grep -v grep | grep -v "haproxy.sh" | awk '{print $2}'`
 	if [[ ! -z $PID ]]; then