From 0809b51725fe8da74264dc1791d2a189ebc8b0ec Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 17 Aug 2023 12:27:31 +0800 Subject: [PATCH] updaate --- plugins/mongodb/index.py | 17 ++++++----------- plugins/mongodb/info.json | 1 + plugins/mongodb/install.sh | 2 ++ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/plugins/mongodb/index.py b/plugins/mongodb/index.py index 02a7947a6..ce66e65ac 100755 --- a/plugins/mongodb/index.py +++ b/plugins/mongodb/index.py @@ -217,6 +217,9 @@ def runLog(): def installPreInspection(version): + if mw.isAppleSystem(): + return 'ok' + sys = mw.execShell( "cat /etc/*-release | grep PRETTY_NAME |awk -F = '{print $2}' | awk -F '\"' '{print $2}'| awk '{print $1}'") @@ -229,17 +232,9 @@ def installPreInspection(version): sysName = sys[0].strip().lower() sysId = sys_id[0].strip() - if not sysName in ('centos', 'fedora', 'ubuntu', 'debian'): - return '暂时仅不支持{}'.format(sysName) - - if sysName == 'debian': - if version > 10: - return 'mongodb[' + version + ']不支持安装在debian[' + sysId + ']' - - if sysName == 'ubuntu': - if version < 16: - return 'mongodb[' + version + ']不支持安装在ubuntu[' + sysId + ']' - + supportOs = ['centos', 'ubuntu', 'debian', 'opensuse'] + if not sysName in supportOs: + return '暂时仅支持{}'.format(','.join(supportOs)) return 'ok' if __name__ == "__main__": diff --git a/plugins/mongodb/info.json b/plugins/mongodb/info.json index 48d50b0d9..dcfbf1a3f 100755 --- a/plugins/mongodb/info.json +++ b/plugins/mongodb/info.json @@ -4,6 +4,7 @@ "name": "mongodb", "title": "Mongodb", "shell": "install.sh", + "install_pre_inspection":true, "versions":["4.4","5.0","6.0","7.0"], "tip": "soft", "checks": "server/mongodb", diff --git a/plugins/mongodb/install.sh b/plugins/mongodb/install.sh index 73238a313..efc4ff67a 100755 --- a/plugins/mongodb/install.sh +++ b/plugins/mongodb/install.sh @@ -2,6 +2,8 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin export PATH +# https://www.mongodb.com/try/download/community + ''' cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/mongodb && /bin/bash install.sh install 5.0.4 cd /www/server/mdserver-web/plugins/mongodb && /bin/bash install.sh install 7.0