yan/mdserver-web
1
0
Fork 0
mirror of https://github.com/midoks/mdserver-web.git synced 2026-10-18 23:45:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Mr Chen
2019-01-15 17:57:33 +08:00
parent daff85768d
commit 1407a44b5e
4 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
class/core/system_api.py
+3 -3
View File
@@ -12,7 +12,7 @@ from flask import request
import db import db
import public import public
import config import config_api
from threading import Thread from threading import Thread
@@ -643,7 +643,7 @@ class system_api:
if not public.isRestart(): if not public.isRestart():
return public.returnJson(False, '请等待所有安装任务完成再执行!') return public.returnJson(False, '请等待所有安装任务完成再执行!')
if stype == 'check': if stype == 'check':
version_now = config.config().getVersion() version_now = config_api.config_api().getVersion()
version_new_info = self.getServerInfo() version_new_info = self.getServerInfo()
if not 'version' in version_new_info: if not 'version' in version_new_info:
return public.returnJson(False, '服务器数据有问题!') return public.returnJson(False, '服务器数据有问题!')
@@ -659,7 +659,7 @@ class system_api:
if stype == 'info': if stype == 'info':
version_new_info = self.getServerInfo() version_new_info = self.getServerInfo()
version_now = config.config().getVersion() version_now = config_api.config_api().getVersion()
if not 'version' in version_new_info: if not 'version' in version_new_info:
return public.returnJson(False, '服务器数据有问题!') return public.returnJson(False, '服务器数据有问题!')
scripts/install.sh
+27 -23
View File
@@ -6,32 +6,36 @@ is64bit=`getconf LONG_BIT`
startTime=`date +%s` startTime=`date +%s`
_os=`uname`
mkdir -p /www/server if [ "$_os" == "Darwin" ] ; then
mkdir -p /www/wwwroot OSNAME='MAC'
mkdir -p /www/wwwlogs elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then
mkdir -p /www/backup/database OSNAME='CentOS'
mkdir -p /www/backup/site 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
OSNAME='Aliyun'
elif grep -Eqi "Fedora" /etc/issue || grep -Eq "Fedora" /etc/*-release; then
OSNAME='Fedora'
elif grep -Eqi "Amazon Linux AMI" /etc/issue || grep -Eq "Amazon Linux AMI" /etc/*-release; then
OSNAME='Amazon'
elif grep -Eqi "Debian" /etc/issue || grep -Eq "Debian" /etc/*-release; then
OSNAME='Debian'
elif grep -Eqi "Ubuntu" /etc/issue || grep -Eq "Ubuntu" /etc/*-release; then
OSNAME='Ubuntu'
elif grep -Eqi "Raspbian" /etc/issue || grep -Eq "Raspbian" /etc/*-release; then
OSNAME='Raspbian'
elif grep -Eqi "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then
OSNAME='Deepin'
else
OSNAME='unknow'
fi
yum -y provides '*/applydeltarpm' if [ "$OSNAME" == 'MAC' ];then
yum -y install deltarpm curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install_macos.sh | sh
fi
yum install -y wget curl unzip zip
wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
cd /tmp && unzip /tmp/master.zip
mv /tmp/mdserver-web-master /www/server/mdserver-web
yum groupinstall -y "Development Tools"
paces="wget python-devel python-imaging zip unzip openssl openssl-devel gcc libxml2 libxml2-dev libxslt* zlib zlib-devel libjpeg-devel libpng-devel libwebp libwebp-devel freetype freetype-devel lsof pcre pcre-devel vixie-cron crontabs"
yum -y install $paces
yum -y lsof net-tools.x86_64
yum -y install ncurses-devel mysql-dev
yum -y install epel-release python-pip python-devel
pip install --upgrade pip
pip install -r /www/server/mdserver-web/requirements.txt
endTime=`date +%s` endTime=`date +%s`
scripts/install_centos.sh
+2 -3
View File
@@ -6,7 +6,6 @@ is64bit=`getconf LONG_BIT`
startTime=`date +%s` startTime=`date +%s`
mkdir -p /www/server mkdir -p /www/server
mkdir -p /www/wwwroot mkdir -p /www/wwwroot
mkdir -p /www/wwwlogs mkdir -p /www/wwwlogs
@@ -27,14 +26,14 @@ mv /tmp/mdserver-web-master /www/server/mdserver-web
yum groupinstall -y "Development Tools" yum groupinstall -y "Development Tools"
paces="wget python-devel python-imaging zip unzip openssl openssl-devel gcc libxml2 libxml2-dev libxslt* zlib zlib-devel libjpeg-devel libpng-devel libwebp libwebp-devel freetype freetype-devel lsof pcre pcre-devel vixie-cron crontabs" paces="wget python-devel python-imaging zip unzip openssl openssl-devel gcc libxml2 libxml2-dev libxslt* zlib zlib-devel libjpeg-devel libpng-devel libwebp libwebp-devel freetype freetype-devel lsof pcre pcre-devel vixie-cron crontabs"
yum -y install $paces yum -y install $paces
yum -y lsof net-tools.x86_64
yum -y install ncurses-devel mysql-dev
yum -y install epel-release python-pip python-devel yum -y install epel-release python-pip python-devel
pip install --upgrade pip pip install --upgrade pip
pip install -r /www/server/mdserver-web/requirements.txt pip install -r /www/server/mdserver-web/requirements.txt
endTime=`date +%s` endTime=`date +%s`
((outTime=($endTime-$startTime)/60)) ((outTime=($endTime-$startTime)/60))
echo -e "Time consumed:\033[32m $outTime \033[0mMinute!" echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"
scripts/install_macos.sh
+24 -28
View File
@@ -2,39 +2,35 @@
PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
export PATH export PATH
LANG=en_US.UTF-8 LANG=en_US.UTF-8
is64bit=`getconf LONG_BIT`
startTime=`date +%s` USER=$(who | sed -n "2,1p" |awk '{print $1}')
DEV="/Users/${USER}/Desktop/mwdev"
mkdir -p /www/server mkdir -p $DEV
mkdir -p /www/wwwroot mkdir -p $DEV
mkdir -p /www/wwwlogs mkdir -p $DEV/server
mkdir -p /www/backup/database mkdir -p $DEV/wwwlogs
mkdir -p /www/backup/site mkdir -p $DEV/backup/database
mkdir -p $DEV/backup/site
# install brew
if [ ! -f /usr/local/bin/brew ];then
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
brew install python@2
brew install mysql
fi
yum -y provides '*/applydeltarpm' if [ ! -f $DEV/server/mdserver-web ]; then
yum -y install deltarpm wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
cd /tmp && unzip /tmp/master.zip
yum install -y wget curl unzip zip mv /tmp/mdserver-web-master $DEV/server/mdserver-web
rm -f /tmp/master.zip
rm -rf /tmp/mdserver-web-master
fi
wget -O /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master pip install -r $DEV/server/mdserver-web/requirements.txt
cd /tmp && unzip /tmp/master.zip
mv /tmp/mdserver-web-master /www/server/mdserver-web
yum groupinstall -y "Development Tools" cd $DEV/server/mdserver-web && ./cli.sh debug
paces="wget python-devel python-imaging zip unzip openssl openssl-devel gcc libxml2 libxml2-dev libxslt* zlib zlib-devel libjpeg-devel libpng-devel libwebp libwebp-devel freetype freetype-devel lsof pcre pcre-devel vixie-cron crontabs"
yum -y install $paces
yum -y install epel-release python-pip python-devel
pip install --upgrade pip
pip install -r /www/server/mdserver-web/requirements.txt
endTime=`date +%s`
((outTime=($endTime-$startTime)/60))
echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"