From dd8c97f4b81839ff0682232a2f24dcff319c8e96 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 18 Nov 2023 17:17:55 +0800
Subject: [PATCH] update

---
 plugins/haproxy/versions/2.6/install.sh | 15 +++++++++++++++
 plugins/keepalived/install.sh           | 15 ---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/plugins/haproxy/versions/2.6/install.sh b/plugins/haproxy/versions/2.6/install.sh
index 2405b6c06..229a7dcc3 100755
--- a/plugins/haproxy/versions/2.6/install.sh
+++ b/plugins/haproxy/versions/2.6/install.sh
@@ -26,6 +26,21 @@ Install_App()
 
 	APP_DIR=${serverPath}/source/haproxy
 	mkdir -p $APP_DIR
+
+
+	LOCAL_ADDR=common
+    cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"")
+    if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
+        LOCAL_ADDR=cn
+    fi
+
+
+    if [ "${LOCAL_ADDR}" == "cn" ];then
+    	if [ ! -f ${APP_DIR}/haproxy-${VERSION}.tar.gz ];then
+			wget -O ${APP_DIR}/haproxy-${VERSION}.tar.gz https://dl.midoks.me/soft/haproxy/haproxy-${VERSION}.tar.gz
+		fi
+    fi
+
 	
 	if [ ! -f ${APP_DIR}/haproxy-${VERSION}.tar.gz ];then
 		if [ $sysName == 'Darwin' ]; then
diff --git a/plugins/keepalived/install.sh b/plugins/keepalived/install.sh
index f5a12484f..067777cbb 100755
--- a/plugins/keepalived/install.sh
+++ b/plugins/keepalived/install.sh
@@ -27,25 +27,10 @@ Install_App()
 	echo '正在安装keepalived脚本文件...'
 	mkdir -p $serverPath/source/keepalived
 
-	LOCAL_ADDR=common
-    cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"")
-    if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
-        LOCAL_ADDR=cn
-    fi
-
-
-    if [ "${LOCAL_ADDR}" == "cn" ];then
-    	if [ ! -f $serverPath/source/keepalived/keepalived-${VERSION}.tar.gz ];then
-			wget -O $serverPath/source/keepalived/keepalived-${VERSION}.tar.gz https://dl.midoks.me/soft/keepalived/keepalived-${VERSION}.tar.gz
-		fi
-    fi
-
 	if [ ! -f $serverPath/source/keepalived/keepalived-${VERSION}.tar.gz ];then
 		wget -O $serverPath/source/keepalived/keepalived-${VERSION}.tar.gz https://keepalived.org/software/keepalived-${VERSION}.tar.gz
 	fi
 
-
-
 	#检测文件是否损坏.
 	md5_file_ok=8c26f75a8767e5341d82696e1e717115
 	if [ -f $serverPath/source/keepalived/keepalived-${VERSION}.tar.gz ];then