Merge pull request #5 from midoks/dev

merge

scripts/install/centos.sh

@@ -66,7 +66,7 @@ fi
 #安装时不开启
 systemctl stop firewalld
 
-# yum groupinstall -y "Development Tools"
+yum groupinstall -y "Development Tools"
 yum install -y libevent libevent-devel libjpeg* libpng* gd* libxslt* unzip
 yum install -y python-imaging libicu-devel zip bzip2-devel gcc libxml2 libxml2-dev  pcre pcre-devel
 yum install -y libjpeg-devel libpng-devel libwebp libwebp-devel
@@ -81,15 +81,15 @@ if [ ! -f /usr/local/bin/pip3 ];then
 fi
 
 
-echo  "start install lib"
+# echo  "start install lib"
 cd /www/server/mdserver-web/scripts && bash lib.sh
-echo  "end install lib"
+# echo  "end install lib"
 
 
 chmod 755 /www/server/mdserver-web/data
 
 
-echo  "start install python lib"
+# echo  "start install python lib"
 
 pip install --upgrade pip
 pip3 install gunicorn==20.1.0
@@ -103,17 +103,28 @@ pip3 install pymongo
 
 cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt
 
+
+# echo  "start install python env lib"
+
 if [ ! -f /www/server/mdserver-web/bin/activate ];then
 	cd /www/server/mdserver-web && python3 -m venv .
-	sleep 5
-fi
-
-if [ -f /www/server/mdserver-web/bin/activate ];then
-    cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate && pip3 install -r /www/server/mdserver-web/requirements.txt
-    pip install --upgrade pip
+	source /www/server/mdserver-web/bin/activate
+	pip install --upgrade pip
+	pip3 install -r /www/server/mdserver-web/requirements.txt
+	pip3 install gunicorn==20.1.0
+	pip3 install gevent==21.1.2
+	pip3 install gevent-websocket==0.10.1
+	pip3 install requests==2.20.0
+	pip3 install flask-caching==1.10.1
+	pip3 install flask-session==0.3.2
+	pip3 install flask-sqlalchemy==2.3.2
+	pip3 install python-socketio==4.2.0
+	pip3 install psutil==5.9.1
+	pip3 install pymongo
 fi
 
-echo  "end install python lib"
+# echo  "end install python env lib"
+# echo  "end install python lib"
 
 
 cd /www/server/mdserver-web && ./cli.sh start

scripts/lib.sh

@@ -244,17 +244,19 @@ echo -e "Install_Curl" >> ${libPath}/lib.pl
 }
 
 
-_os=`uname`
 
 if grep -Eqi "Ubuntu" /etc/issue || grep -Eq "Ubuntu" /etc/*-release; then
     sudo ln -sf /bin/bash /bin/sh
     #sudo dpkg-reconfigure dash
 fi
 
+_os=`uname`
 if [ ${_os} == "Darwin" ]; then
     OSNAME='macos'
 elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then
     OSNAME='centos'
+elif grep -Eqi "Rocky" /etc/issue || grep -Eq "Rocky" /etc/*-release; then
+    OSNAME='rocky'
 elif grep -Eqi "Red Hat Enterprise Linux Server" /etc/issue || grep -Eq "Red Hat Enterprise Linux Server" /etc/*-release; then
     OSNAME='rhel'
 elif grep -Eqi "Aliyun" /etc/issue || grep -Eq "Aliyun" /etc/*-release; then
@@ -292,7 +294,7 @@ elif [ "$OSNAME" == "ubuntu"  ] || [ "$OSNAME" == "debian" ]; then
     apt install -y libffi-dev
     apt install -y cmake automake make
 
-    apt install -y php-common webp scons
+    apt install -y webp scons
     apt install -y lzma lzma-dev libunwind-dev
 
     apt install -y libpcre3 libpcre3-dev 
@@ -328,19 +330,17 @@ elif [ "$OSNAME" == "ubuntu"  ] || [ "$OSNAME" == "debian" ]; then
 else
 
     yum install -y openldap openldap-devel libtirpc libtirpc-devel rpcgen
-
     yum install -y bison re2c cmake
 
     yum install -y libmemcached libmemcached-devel
     yum install -y curl-devel
     yum install -y zlib zlib-devel
+    yum install -y libzip libzip-devel
     yum install -y pcre pcre-devel
     yum install -y icu libicu-devel autoconf
     yum install -y freetype freetype-devel
     yum install -y openssl openssl-devel
-    yum install -y libzip libzip-devel
     yum install -y graphviz libxml2 libxml2-devel
-
     yum install -y sqlite-devel
     yum install -y oniguruma oniguruma-devel
     yum install -y ImageMagick ImageMagick-devel