From 7b39b28dcd9acefe45b0291b5d1afd1b7f45ad7b Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Tue, 13 Dec 2022 00:08:15 +0800
Subject: [PATCH] =?UTF-8?q?debian=E7=B3=BB=E5=88=97=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/install.sh            |   2 +-
 scripts/install/debian.bak.sh | 162 ++++++++++++++++++++++++++++
 scripts/install/debian.sh     | 198 +++++++++++++++++++---------------
 scripts/install_dev.sh        |   2 +-
 4 files changed, 277 insertions(+), 87 deletions(-)
 create mode 100644 scripts/install/debian.bak.sh
 mode change 100644 => 100755 scripts/install/debian.sh

diff --git a/scripts/install.sh b/scripts/install.sh
index c49a4aa19..6baba61fa 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -47,7 +47,7 @@ elif grep -Eqi "Debian" /etc/issue || grep -Eq "Debian" /etc/os-release; then
 	apt update -y
 	apt install -y wget curl zip unzip tar
 elif grep -Eqi "Ubuntu" /etc/issue || grep -Eq "Ubuntu" /etc/os-release; then
-	OSNAME='debian'
+	OSNAME='ubuntu'
 	apt update -y
 	apt install -y wget curl zip unzip tar
 else
diff --git a/scripts/install/debian.bak.sh b/scripts/install/debian.bak.sh
new file mode 100644
index 000000000..dd8f77aeb
--- /dev/null
+++ b/scripts/install/debian.bak.sh
@@ -0,0 +1,162 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+export LANG=en_US.UTF-8
+export DEBIAN_FRONTEND=noninteractive
+
+DISTRO=''
+if grep -Eqi "Debian" /etc/issue || grep -Eq "Debian" /etc/*-release; then
+	DISTRO='debian'
+elif grep -Eqi "Ubuntu" /etc/issue || grep -Eq "Ubuntu" /etc/*-release; then
+	DISTRO='ubuntu'
+fi
+VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+
+cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
+NTPHOST='time.nist.gov'
+if [ ! -z "$cn" ];then
+    NTPHOST='ntp1.aliyun.com'
+fi
+
+ln -sf /bin/bash /bin/sh
+
+__GET_BIT=`getconf LONG_BIT`
+if [ "$__GET_BIT" == "32" ];then
+	# install rust | 32bit need
+	# curl https://sh.rustup.rs -sSf | sh
+	apt install -y rustc
+fi
+
+# synchronize time first
+apt-get install ntpdate -y
+ntpdate $NTPHOST | logger -t NTP
+
+apt-get update -y
+apt install -y wget curl lsof unzip tar cron expect locate
+apt install -y python3-pip python3-dev python3-venv
+locale-gen en_US.UTF-8
+localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
+
+if [ -f /usr/sbin/ufw ];then
+
+	ufw allow 22/tcp
+	ufw allow 80/tcp
+	ufw allow 443/tcp
+	ufw allow 888/tcp
+	# ufw allow 7200/tcp
+	# ufw allow 3306/tcp
+	# ufw allow 30000:40000/tcp
+
+fi
+
+if [ -f /usr/sbin/ufw ];then
+	ufw disable
+fi
+
+if [ ! -f /usr/sbin/ufw ];then
+	apt install -y firewalld
+	systemctl enable firewalld
+	systemctl start firewalld
+
+	firewall-cmd --permanent --zone=public --add-port=22/tcp
+	firewall-cmd --permanent --zone=public --add-port=80/tcp
+	firewall-cmd --permanent --zone=public --add-port=443/tcp
+	firewall-cmd --permanent --zone=public --add-port=888/tcp
+	# firewall-cmd --permanent --zone=public --add-port=7200/tcp
+	# firewall-cmd --permanent --zone=public --add-port=3306/tcp
+	# firewall-cmd --permanent --zone=public --add-port=30000-40000/tcp
+
+	# fix:debian10 firewalld faq
+	# https://kawsing.gitbook.io/opensystem/andoid-shou-ji/untitled/fang-huo-qiang#debian-10-firewalld-0.6.3-error-commandfailed-usrsbinip6tablesrestorewn-failed-ip6tablesrestore-v1.8
+	sed -i 's#IndividualCalls=no#IndividualCalls=yes#g' /etc/firewalld/firewalld.conf
+
+	firewall-cmd --reload
+fi
+
+#安装时不开启
+systemctl stop firewalld
+
+if [ "$DISTRO" == 'debian' ]; then
+	#fix zlib1g-dev fail
+	echo -e "\e[0;32mfix zlib1g-dev install question start\e[0m"
+	Install_TmpFile=/tmp/debian-fix-zlib1g-dev.txt
+	apt install -y zlib1g-dev > ${Install_TmpFile}
+	if [ "$?" != "0" ];then
+		ZLIB1G_BASE_VER=$(cat ${Install_TmpFile} | grep zlib1g | awk -F "=" '{print $2}' | awk -F ")" '{print $1}')
+		ZLIB1G_BASE_VER=`echo ${ZLIB1G_BASE_VER} | sed "s/^[ \s]\{1,\}//g;s/[ \s]\{1,\}$//g"`
+		# echo "1${ZLIB1G_BASE_VER}1"
+		echo -e "\e[1;31mapt install zlib1g=${ZLIB1G_BASE_VER} zlib1g-dev\e[0m"
+		echo "Y" | apt install zlib1g=${ZLIB1G_BASE_VER}  zlib1g-dev
+	fi
+	rm -rf ${Install_TmpFile}
+	echo -e "\e[0;32mfix zlib1g-dev install question end\e[0m"
+
+
+	#fix libunwind-dev fail
+	echo -e "\e[0;32mfix libunwind-dev install question start\e[0m"
+	Install_TmpFile=/tmp/debian-fix-libunwind-dev.txt
+	apt install -y libunwind-dev > ${Install_TmpFile}
+	if [ "$?" != "0" ];then
+		liblzma5_BASE_VER=$(cat ${Install_TmpFile} | grep liblzma-dev | awk -F "=" '{print $2}' | awk -F ")" '{print $1}')
+		liblzma5_BASE_VER=`echo ${liblzma5_BASE_VER} | sed "s/^[ \s]\{1,\}//g;s/[ \s]\{1,\}$//g"`
+		echo -e "\e[1;31mapt install liblzma5=${liblzma5_BASE_VER} libunwind-dev\e[0m"
+		echo "Y" | apt install liblzma5=${liblzma5_BASE_VER} libunwind-dev
+	fi
+	rm -rf ${Install_TmpFile}
+	echo -e "\e[0;32mfix libunwind-dev install question end\e[0m"
+
+
+	apt install -y libvpx-dev
+	apt install -y libxpm-dev
+	apt install -y libwebp-dev
+	apt install -y libfreetype6-dev
+
+	localedef -i en_US -f UTF-8 en_US.UTF-8
+
+	if [ "$VERSION_ID" == "9" ];then
+		sed "s/flask==2.0.3/flask==1.1.1/g" -i /www/server/mdserver-web/requirements.txt
+		sed "s/cryptography==3.3.2/cryptography==2.5/g" -i /www/server/mdserver-web/requirements.txt
+		sed "s/configparser==5.2.0/configparser==4.0.2/g" -i /www/server/mdserver-web/requirements.txt
+		sed "s/flask-socketio==5.2.0/flask-socketio==4.2.0/g" -i /www/server/mdserver-web/requirements.txt
+		sed "s/python-engineio==4.3.2/python-engineio==3.9.0/g" -i /www/server/mdserver-web/requirements.txt
+		# pip3 install -r /www/server/mdserver-web/requirements.txt
+	fi
+fi
+
+apt install -y build-essential devscripts
+
+apt install --ignore-missing -y autoconf automake cmake curl dia gcc imagemagick libbz2-dev libcurl4-gnutls-dev\
+    libcurl4-openssl-dev libevent-dev libffi-dev libfreetype6 libfreetype6-dev libgmp-dev libgmp3-dev libicu-dev \
+	libjpeg-dev libjpeg62-turbo-dev libldap2-dev libmagickwand-dev libmcrypt-dev libmemcached-dev libncurses5-dev \
+	libpcre3 libpcre3-dev libpng-dev libpspell-dev libreadline-dev librecode-dev libsasl2-dev libssl-dev \
+	libunwind-dev libwebp-dev libxml2 libxml2-dev libxpm-dev libzip-dev lzma lzma-dev make net-tools openssl \
+	pkg-config python3-dev scons webp zlib1g-dev
+
+
+#https://blog.csdn.net/qq_36228377/article/details/123154344
+# ln -s  /usr/include/x86_64-linux-gnu/curl  /usr/include/curl
+if [ ! -d /usr/include/curl ];then
+    ln -s  /usr/include/x86_64-linux-gnu/curl  /usr/include/curl
+fi
+
+
+apt install -y graphviz bison re2c flex libsqlite3-dev libonig-dev perl g++ libtool libxslt1-dev
+apt install -y libmariadb-dev libmariadb-dev-compat
+
+#apt install -y libmysqlclient-dev
+#apt install -y libmariadbclient-dev
+
+if [ "$DISTRO" == 'ubuntu' ] && [ "${VERSION_ID}" == "22.04" ]; then
+	apt install -y patchelf
+	apt install -y python3-cffi
+	pip3 install -U --force-reinstall --no-binary :all: gevent
+fi
+
+cd /www/server/mdserver-web/scripts && bash lib.sh
+chmod 755 /www/server/mdserver-web/data
+
+if [ "$DISTRO" == 'ubuntu' ] && [ "${VERSION_ID}" == "22.04" ]; then
+	apt install -y patchelf
+	apt install -y python3-cffi
+	pip3 install -U --force-reinstall --no-binary :all: gevent
+fi
\ No newline at end of file
diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh
old mode 100644
new mode 100755
index dd8f77aeb..2c82070b2
--- a/scripts/install/debian.sh
+++ b/scripts/install/debian.sh
@@ -4,22 +4,10 @@ export PATH
 export LANG=en_US.UTF-8
 export DEBIAN_FRONTEND=noninteractive
 
-DISTRO=''
-if grep -Eqi "Debian" /etc/issue || grep -Eq "Debian" /etc/*-release; then
-	DISTRO='debian'
-elif grep -Eqi "Ubuntu" /etc/issue || grep -Eq "Ubuntu" /etc/*-release; then
-	DISTRO='ubuntu'
-fi
-VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
-
-cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
-NTPHOST='time.nist.gov'
-if [ ! -z "$cn" ];then
-    NTPHOST='ntp1.aliyun.com'
+if grep -Eq "Debian" /etc/*-release; then
+    ln -sf /bin/bash /bin/sh
 fi
 
-ln -sf /bin/bash /bin/sh
-
 __GET_BIT=`getconf LONG_BIT`
 if [ "$__GET_BIT" == "32" ];then
 	# install rust | 32bit need
@@ -29,14 +17,27 @@ fi
 
 # synchronize time first
 apt-get install ntpdate -y
-ntpdate $NTPHOST | logger -t NTP
+ntpdate time.nist.gov | logger -t NTP
+
+apt update -y
+apt-get update -y 
+
 
-apt-get update -y
-apt install -y wget curl lsof unzip tar cron expect locate
-apt install -y python3-pip python3-dev python3-venv
+apt install -y wget curl lsof unzip
+apt install -y python3-pip
+apt install -y python3-dev
+apt install -y python3-venv
+apt install -y cron
+apt install -y expect
+
+apt install -y locate
 locale-gen en_US.UTF-8
 localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
 
+if [ ! -d /root/.acme.sh ];then	
+	curl  https://get.acme.sh | sh
+fi
+
 if [ -f /usr/sbin/ufw ];then
 
 	ufw allow 22/tcp
@@ -50,9 +51,12 @@ if [ -f /usr/sbin/ufw ];then
 fi
 
 if [ -f /usr/sbin/ufw ];then
+
 	ufw disable
+
 fi
 
+
 if [ ! -f /usr/sbin/ufw ];then
 	apt install -y firewalld
 	systemctl enable firewalld
@@ -76,63 +80,92 @@ fi
 #安装时不开启
 systemctl stop firewalld
 
-if [ "$DISTRO" == 'debian' ]; then
-	#fix zlib1g-dev fail
-	echo -e "\e[0;32mfix zlib1g-dev install question start\e[0m"
-	Install_TmpFile=/tmp/debian-fix-zlib1g-dev.txt
-	apt install -y zlib1g-dev > ${Install_TmpFile}
-	if [ "$?" != "0" ];then
-		ZLIB1G_BASE_VER=$(cat ${Install_TmpFile} | grep zlib1g | awk -F "=" '{print $2}' | awk -F ")" '{print $1}')
-		ZLIB1G_BASE_VER=`echo ${ZLIB1G_BASE_VER} | sed "s/^[ \s]\{1,\}//g;s/[ \s]\{1,\}$//g"`
-		# echo "1${ZLIB1G_BASE_VER}1"
-		echo -e "\e[1;31mapt install zlib1g=${ZLIB1G_BASE_VER} zlib1g-dev\e[0m"
-		echo "Y" | apt install zlib1g=${ZLIB1G_BASE_VER}  zlib1g-dev
-	fi
-	rm -rf ${Install_TmpFile}
-	echo -e "\e[0;32mfix zlib1g-dev install question end\e[0m"
-
-
-	#fix libunwind-dev fail
-	echo -e "\e[0;32mfix libunwind-dev install question start\e[0m"
-	Install_TmpFile=/tmp/debian-fix-libunwind-dev.txt
-	apt install -y libunwind-dev > ${Install_TmpFile}
-	if [ "$?" != "0" ];then
-		liblzma5_BASE_VER=$(cat ${Install_TmpFile} | grep liblzma-dev | awk -F "=" '{print $2}' | awk -F ")" '{print $1}')
-		liblzma5_BASE_VER=`echo ${liblzma5_BASE_VER} | sed "s/^[ \s]\{1,\}//g;s/[ \s]\{1,\}$//g"`
-		echo -e "\e[1;31mapt install liblzma5=${liblzma5_BASE_VER} libunwind-dev\e[0m"
-		echo "Y" | apt install liblzma5=${liblzma5_BASE_VER} libunwind-dev
-	fi
-	rm -rf ${Install_TmpFile}
-	echo -e "\e[0;32mfix libunwind-dev install question end\e[0m"
-
-
-	apt install -y libvpx-dev
-	apt install -y libxpm-dev
-	apt install -y libwebp-dev
-	apt install -y libfreetype6-dev
-
-	localedef -i en_US -f UTF-8 en_US.UTF-8
-
-	if [ "$VERSION_ID" == "9" ];then
-		sed "s/flask==2.0.3/flask==1.1.1/g" -i /www/server/mdserver-web/requirements.txt
-		sed "s/cryptography==3.3.2/cryptography==2.5/g" -i /www/server/mdserver-web/requirements.txt
-		sed "s/configparser==5.2.0/configparser==4.0.2/g" -i /www/server/mdserver-web/requirements.txt
-		sed "s/flask-socketio==5.2.0/flask-socketio==4.2.0/g" -i /www/server/mdserver-web/requirements.txt
-		sed "s/python-engineio==4.3.2/python-engineio==3.9.0/g" -i /www/server/mdserver-web/requirements.txt
-		# pip3 install -r /www/server/mdserver-web/requirements.txt
-	fi
+
+#fix zlib1g-dev fail
+echo -e "\e[0;32mfix zlib1g-dev install question start\e[0m"
+Install_TmpFile=/tmp/debian-fix-zlib1g-dev.txt
+apt install -y zlib1g-dev > ${Install_TmpFile}
+if [ "$?" != "0" ];then
+	ZLIB1G_BASE_VER=$(cat ${Install_TmpFile} | grep zlib1g | awk -F "=" '{print $2}' | awk -F ")" '{print $1}')
+	ZLIB1G_BASE_VER=`echo ${ZLIB1G_BASE_VER} | sed "s/^[ \s]\{1,\}//g;s/[ \s]\{1,\}$//g"`
+	# echo "1${ZLIB1G_BASE_VER}1"
+	echo -e "\e[1;31mapt install zlib1g=${ZLIB1G_BASE_VER} zlib1g-dev\e[0m"
+	echo "Y" | apt install zlib1g=${ZLIB1G_BASE_VER}  zlib1g-dev
+fi
+rm -rf ${Install_TmpFile}
+echo -e "\e[0;32mfix zlib1g-dev install question end\e[0m"
+
+
+#fix libunwind-dev fail
+echo -e "\e[0;32mfix libunwind-dev install question start\e[0m"
+Install_TmpFile=/tmp/debian-fix-libunwind-dev.txt
+apt install -y libunwind-dev > ${Install_TmpFile}
+if [ "$?" != "0" ];then
+	liblzma5_BASE_VER=$(cat ${Install_TmpFile} | grep liblzma-dev | awk -F "=" '{print $2}' | awk -F ")" '{print $1}')
+	liblzma5_BASE_VER=`echo ${liblzma5_BASE_VER} | sed "s/^[ \s]\{1,\}//g;s/[ \s]\{1,\}$//g"`
+	echo -e "\e[1;31mapt install liblzma5=${liblzma5_BASE_VER} libunwind-dev\e[0m"
+	echo "Y" | apt install liblzma5=${liblzma5_BASE_VER} libunwind-dev
 fi
+rm -rf ${Install_TmpFile}
+echo -e "\e[0;32mfix libunwind-dev install question end\e[0m"
 
-apt install -y build-essential devscripts
 
-apt install --ignore-missing -y autoconf automake cmake curl dia gcc imagemagick libbz2-dev libcurl4-gnutls-dev\
-    libcurl4-openssl-dev libevent-dev libffi-dev libfreetype6 libfreetype6-dev libgmp-dev libgmp3-dev libicu-dev \
-	libjpeg-dev libjpeg62-turbo-dev libldap2-dev libmagickwand-dev libmcrypt-dev libmemcached-dev libncurses5-dev \
-	libpcre3 libpcre3-dev libpng-dev libpspell-dev libreadline-dev librecode-dev libsasl2-dev libssl-dev \
-	libunwind-dev libwebp-dev libxml2 libxml2-dev libxpm-dev libzip-dev lzma lzma-dev make net-tools openssl \
-	pkg-config python3-dev scons webp zlib1g-dev
+apt install -y libvpx-dev 
+apt install -y libxpm-dev
+apt install -y libwebp-dev
+apt install -y libfreetype6-dev
 
+sudo localedef -i en_US -f UTF-8 en_US.UTF-8
+
+VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+if [ "$VERSION_ID" == "9" ];then
+	sed "s/flask==2.0.3/flask==1.1.1/g" -i /www/server/mdserver-web/requirements.txt
+	sed "s/cryptography==3.3.2/cryptography==2.5/g" -i /www/server/mdserver-web/requirements.txt
+	sed "s/configparser==5.2.0/configparser==4.0.2/g" -i /www/server/mdserver-web/requirements.txt
+	sed "s/flask-socketio==5.2.0/flask-socketio==4.2.0/g" -i /www/server/mdserver-web/requirements.txt
+	sed "s/python-engineio==4.3.2/python-engineio==3.9.0/g" -i /www/server/mdserver-web/requirements.txt
+	# pip3 install -r /www/server/mdserver-web/requirements.txt
+fi
 
+apt install -y devscripts
+apt install -y net-tools
+apt install -y python3-dev
+apt install -y autoconf
+apt install -y gcc
+
+apt install -y libffi-dev
+apt install -y cmake automake make
+
+apt install -y webp scons
+apt install -y libwebp-dev
+apt install -y lzma lzma-dev
+apt install -y libunwind-dev
+
+apt install -y libpcre3 libpcre3-dev 
+apt install -y openssl
+apt install -y libssl-dev
+
+apt install -y libmemcached-dev
+apt install -y libsasl2-dev
+apt install -y imagemagick 
+apt install -y libmagickwand-dev
+
+apt install -y libxml2 libxml2-dev libbz2-dev libmcrypt-dev libpspell-dev librecode-dev
+apt install -y libgmp-dev libgmp3-dev libreadline-dev libxpm-dev
+apt install -y dia pkg-config
+apt install -y zlib1g-dev
+apt install -y libjpeg-dev libpng-dev
+apt install -y libfreetype6
+apt install -y libjpeg62-turbo-dev
+apt install -y libfreetype6-dev
+apt install -y libevent-dev libncurses5-dev libldap2-dev
+apt install -y libzip-dev
+apt install -y libicu-dev
+
+apt install -y build-essential
+
+apt install -y libcurl4-openssl-dev
+apt install -y curl libcurl4-gnutls-dev
 #https://blog.csdn.net/qq_36228377/article/details/123154344
 # ln -s  /usr/include/x86_64-linux-gnu/curl  /usr/include/curl
 if [ ! -d /usr/include/curl ];then
@@ -140,23 +173,18 @@ if [ ! -d /usr/include/curl ];then
 fi
 
 
-apt install -y graphviz bison re2c flex libsqlite3-dev libonig-dev perl g++ libtool libxslt1-dev
-apt install -y libmariadb-dev libmariadb-dev-compat
+apt install -y graphviz bison re2c flex
+apt install -y libsqlite3-dev
+apt install -y libonig-dev
 
-#apt install -y libmysqlclient-dev
-#apt install -y libmariadbclient-dev
-
-if [ "$DISTRO" == 'ubuntu' ] && [ "${VERSION_ID}" == "22.04" ]; then
-	apt install -y patchelf
-	apt install -y python3-cffi
-	pip3 install -U --force-reinstall --no-binary :all: gevent
-fi
+apt install -y perl g++ libtool    
+apt install -y libxslt1-dev
 
+apt install -y libmariadb-dev
+#apt install -y libmysqlclient-dev   
+apt install -y libmariadb-dev-compat
+#apt install -y libmariadbclient-dev
+    
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
-if [ "$DISTRO" == 'ubuntu' ] && [ "${VERSION_ID}" == "22.04" ]; then
-	apt install -y patchelf
-	apt install -y python3-cffi
-	pip3 install -U --force-reinstall --no-binary :all: gevent
-fi
\ No newline at end of file
diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh
index bbb4067cd..c43a34e53 100755
--- a/scripts/install_dev.sh
+++ b/scripts/install_dev.sh
@@ -47,7 +47,7 @@ elif grep -Eqi "Debian" /etc/issue || grep -Eq "Debian" /etc/*-release; then
 	apt install -y devscripts
 	apt install -y wget zip unzip
 elif grep -Eqi "Ubuntu" /etc/issue || grep -Eq "Ubuntu" /etc/*-release; then
-	OSNAME='debian'
+	OSNAME='ubuntu'
 	apt install -y wget zip unzip
 else
 	OSNAME='unknow'