From 4307700d0382b15251021110da81695e8cb21ee0 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 21 Jun 2022 12:51:30 +0800 Subject: [PATCH 01/10] Update centos.sh --- scripts/install/centos.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index 49ae894eb..f2b20f964 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -86,13 +86,13 @@ cd /www/server/mdserver-web/scripts && bash lib.sh chmod 755 /www/server/mdserver-web/data +pip install --upgrade pip if [ ! -f /www/server/mdserver-web/bin/activate ];then cd /www/server/mdserver-web && python3 -m venv . 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 pip3 install gunicorn==20.1.0 pip3 install gevent==21.1.2 pip3 install gevent-websocket==0.10.1 @@ -102,7 +102,6 @@ if [ -f /www/server/mdserver-web/bin/activate ];then pip3 install psutil==5.9.1 pip3 install pymongo else - pip install --upgrade pip cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt pip3 install gunicorn==20.1.0 pip3 install gevent==21.1.2 From 90fc96c04eb770ae50ae07d76b9fc7156ee8e9cd Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 21 Jun 2022 12:51:57 +0800 Subject: [PATCH 02/10] Update centos.sh --- scripts/install/centos.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index f2b20f964..e330b24aa 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -93,6 +93,7 @@ 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 pip3 install gunicorn==20.1.0 pip3 install gevent==21.1.2 pip3 install gevent-websocket==0.10.1 @@ -103,6 +104,7 @@ if [ -f /www/server/mdserver-web/bin/activate ];then pip3 install pymongo else cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt + pip install --upgrade pip pip3 install gunicorn==20.1.0 pip3 install gevent==21.1.2 pip3 install gevent-websocket==0.10.1 From 461a9582dffcf0e1f84afaac38f49d58726b4f2f Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 21 Jun 2022 14:12:31 +0800 Subject: [PATCH 03/10] Update centos.sh --- scripts/install/centos.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index e330b24aa..0ebc07ca1 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -82,10 +82,16 @@ if [ ! -f /usr/local/bin/pip3 ];then fi +echo "start install lib" cd /www/server/mdserver-web/scripts && bash lib.sh +echo "end install lib" + + chmod 755 /www/server/mdserver-web/data +echo "start install python lib" + pip install --upgrade pip if [ ! -f /www/server/mdserver-web/bin/activate ];then cd /www/server/mdserver-web && python3 -m venv . @@ -115,6 +121,8 @@ else pip3 install pymongo fi +echo "end install python lib" + cd /www/server/mdserver-web && ./cli.sh start sleep 5 From dee6a755835dae6d34690c9e347cc1de5cd17910 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 21 Jun 2022 14:13:18 +0800 Subject: [PATCH 04/10] Update centos.sh --- scripts/install/centos.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index 0ebc07ca1..016f19203 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -93,6 +93,15 @@ chmod 755 /www/server/mdserver-web/data echo "start install python lib" pip install --upgrade pip +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 python-socketio==4.2.0 +pip3 install psutil==5.9.1 +pip3 install pymongo + if [ ! -f /www/server/mdserver-web/bin/activate ];then cd /www/server/mdserver-web && python3 -m venv . fi @@ -110,15 +119,7 @@ if [ -f /www/server/mdserver-web/bin/activate ];then pip3 install pymongo else cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt - pip install --upgrade pip - 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 python-socketio==4.2.0 - pip3 install psutil==5.9.1 - pip3 install pymongo + fi echo "end install python lib" From 43259330e169976de50b8826555ccd3cdecd2df2 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 21 Jun 2022 15:01:29 +0800 Subject: [PATCH 05/10] up --- scripts/install/centos.sh | 1 - scripts/install_dev.sh | 2 +- scripts/update_dev.sh | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index 016f19203..cd8aef071 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -119,7 +119,6 @@ if [ -f /www/server/mdserver-web/bin/activate ];then pip3 install pymongo else cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt - fi echo "end install python lib" diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh index 643698616..a2710a7ab 100755 --- a/scripts/install_dev.sh +++ b/scripts/install_dev.sh @@ -72,7 +72,7 @@ if [ $OSNAME != "macos" ];then fi echo "use system version: ${OSNAME}" -curl -fsSL https://gitee.com/midoks/mdserver-web/raw/master/scripts/install/${OSNAME}.sh | bash +curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/install/${OSNAME}.sh | bash endTime=`date +%s` diff --git a/scripts/update_dev.sh b/scripts/update_dev.sh index 35285da74..ea986c847 100755 --- a/scripts/update_dev.sh +++ b/scripts/update_dev.sh @@ -52,7 +52,7 @@ rm -rf /tmp/mdserver-web-dev #pip uninstall public echo "use system version: ${OSNAME}" -curl -fsSL https://gitee.com/midoks/mdserver-web/raw/master/scripts/update/${OSNAME}.sh | bash +curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/update/${OSNAME}.sh | bash endTime=`date +%s` ((outTime=($endTime-$startTime)/60)) From bdb4d70d8d60d9f3d6c0b4995b06f88a9732a194 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 21 Jun 2022 15:45:13 +0800 Subject: [PATCH 06/10] up --- scripts/install_dev.sh | 3 ++- scripts/update_dev.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh index a2710a7ab..6a58f0d3d 100755 --- a/scripts/install_dev.sh +++ b/scripts/install_dev.sh @@ -72,7 +72,8 @@ if [ $OSNAME != "macos" ];then fi echo "use system version: ${OSNAME}" -curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/install/${OSNAME}.sh | bash + +curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install/${OSNAME}.sh | bash endTime=`date +%s` diff --git a/scripts/update_dev.sh b/scripts/update_dev.sh index ea986c847..e3bf41f4a 100755 --- a/scripts/update_dev.sh +++ b/scripts/update_dev.sh @@ -52,7 +52,7 @@ rm -rf /tmp/mdserver-web-dev #pip uninstall public echo "use system version: ${OSNAME}" -curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/update/${OSNAME}.sh | bash +curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update/${OSNAME}.sh | bash endTime=`date +%s` ((outTime=($endTime-$startTime)/60)) From e7a3b175494474146ee73e4020009e38b6dd195c Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 21 Jun 2022 16:24:36 +0800 Subject: [PATCH 07/10] Update centos.sh --- scripts/install/centos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index cd8aef071..1576d53ff 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -102,6 +102,8 @@ pip3 install python-socketio==4.2.0 pip3 install psutil==5.9.1 pip3 install pymongo +cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt + if [ ! -f /www/server/mdserver-web/bin/activate ];then cd /www/server/mdserver-web && python3 -m venv . fi @@ -117,8 +119,6 @@ if [ -f /www/server/mdserver-web/bin/activate ];then pip3 install python-socketio==4.2.0 pip3 install psutil==5.9.1 pip3 install pymongo -else - cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt fi echo "end install python lib" From 8e4cf4971e3e4890df5f7dd8a367c8cfde2d4cad Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 21 Jun 2022 17:12:25 +0800 Subject: [PATCH 08/10] Update centos.sh --- scripts/install/centos.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index 1576d53ff..578a09c7a 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -105,20 +105,13 @@ pip3 install pymongo cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt if [ ! -f /www/server/mdserver-web/bin/activate ];then - cd /www/server/mdserver-web && python3 -m venv . + 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 - 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 python-socketio==4.2.0 - pip3 install psutil==5.9.1 - pip3 install pymongo fi echo "end install python lib" From 0a06613e86b6400148d7e24ad0a8b54b91c21c5c Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 21 Jun 2022 17:16:55 +0800 Subject: [PATCH 09/10] Update centos.sh --- scripts/install/centos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index 578a09c7a..cac3468fb 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -68,7 +68,7 @@ systemctl stop firewalld yum groupinstall -y "Development Tools" -yum install -y libevent libevent-devel libjpeg* libpng* gd* libxslt* unzip libmcrypt libmcrypt-devel +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 yum install -y lsof net-tools From 9b8f06a1a669d278289642dcca03ad09a10410a6 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 21 Jun 2022 17:23:38 +0800 Subject: [PATCH 10/10] Update centos.sh --- scripts/install/centos.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index cac3468fb..600e6f0be 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -66,8 +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