From 5ed1f4adb3575ebb6c2ae5b2a30df128847ceaa8 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 13 Mar 2019 17:19:33 +0800 Subject: [PATCH] op --- plugins/gogs/install.sh | 14 +++++++------- plugins/mysql/versions/5.5/install.sh | 2 +- plugins/php/install.sh | 2 +- scripts/install_centos.sh | 3 +-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/plugins/gogs/install.sh b/plugins/gogs/install.sh index 7d1ae82cc..002373497 100755 --- a/plugins/gogs/install.sh +++ b/plugins/gogs/install.sh @@ -49,13 +49,13 @@ Install_gogs() mv $serverPath/source/gogs/gogs_${version}/gogs/ $serverPath/gogs echo $version > $serverPath/gogs/version.pl - if id -u gogs > /dev/null 2>&1; then - echo "csvn user exists" - else - useradd gogs - cp /etc/sudoers{,.`date +"%Y-%m-%d_%H-%M-%S"`} - echo "gogs ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers - fi + # if id -u gogs > /dev/null 2>&1; then + # echo "gogs user exists" + # else + # useradd gogs + # cp /etc/sudoers{,.`date +"%Y-%m-%d_%H-%M-%S"`} + # echo "gogs ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers + # fi echo 'install success' > $install_tmp } diff --git a/plugins/mysql/versions/5.5/install.sh b/plugins/mysql/versions/5.5/install.sh index 8a2ebd3c0..8c3abc1a3 100755 --- a/plugins/mysql/versions/5.5/install.sh +++ b/plugins/mysql/versions/5.5/install.sh @@ -11,7 +11,7 @@ rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") -install_tmp=${rootPath}/tmp/bt_install.pl +install_tmp=${rootPath}/tmp/mw_install.pl mysqlDir=${serverPath}/source/mysql Install_mysql() diff --git a/plugins/php/install.sh b/plugins/php/install.sh index e25f7d9bc..fae802715 100755 --- a/plugins/php/install.sh +++ b/plugins/php/install.sh @@ -7,7 +7,7 @@ rootPath=$(dirname "$curPath") rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") -install_tmp=${rootPath}/tmp/bt_install.pl +install_tmp=${rootPath}/tmp/mw_install.pl action=$1 diff --git a/scripts/install_centos.sh b/scripts/install_centos.sh index bf0f14b01..27c9010fc 100755 --- a/scripts/install_centos.sh +++ b/scripts/install_centos.sh @@ -82,9 +82,8 @@ pip install -r /www/server/mdserver-web/requirements.txt cd /www/server/mdserver-web && ./cli.sh start -cd /www/server/mdserver-web && ./cli.sh stop - sleep 5 +cd /www/server/mdserver-web && ./cli.sh stop cd /www/server/mdserver-web && ./scripts/init.d/mw default cd /www/server/mdserver-web && ./cli.sh start \ No newline at end of file