Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-08 22:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2.0.3' into v2.0.4-dev

Browse Source
This commit is contained in:
Usman Nasir
2020-10-14 14:48:32 +05:00
parent f3ab590fde 84e1bccd0d
commit 032916f161
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plogical/upgrade.py
View File

@@ -2038,16 +2038,10 @@ echo $oConfig->Save() ? 'Done' : 'Error';
### Restore dovecot/postfix conf ### Restore dovecot/postfix conf
command = 'rm -rf %s' % (dovecotConfPath) command = 'cp -pR %s/dovecot/ /etc/' % (configbackups)
Upgrade.executioner(command, 0) Upgrade.executioner(command, 0)
command = 'rm -rf %s' % (postfixConfPath) command = 'cp -pR %s/postfix/ /etc/' % (configbackups)
Upgrade.executioner(command, 0)
command = 'mv %s/dovecot /etc/' % (configbackups)
Upgrade.executioner(command, 0)
command = 'mv %s/postfix /etc/' % (configbackups)
Upgrade.executioner(command, 0) Upgrade.executioner(command, 0)
## Restored ## Restored
@@ -2093,16 +2087,10 @@ echo $oConfig->Save() ? 'Done' : 'Error';
### Restore dovecot/postfix conf ### Restore dovecot/postfix conf
command = 'rm -rf %s' % (dovecotConfPath) command = 'cp -pR %s/dovecot/ /etc/' % (configbackups)
Upgrade.executioner(command, 0) Upgrade.executioner(command, 0)
command = 'rm -rf %s' % (postfixConfPath) command = 'cp -pR %s/postfix/ /etc/' % (configbackups)
Upgrade.executioner(command, 0)
command = 'mv %s/dovecot /etc/' % (configbackups)
Upgrade.executioner(command, 0)
command = 'mv %s/postfix /etc/' % (configbackups)
Upgrade.executioner(command, 0) Upgrade.executioner(command, 0)
## Restored ## Restored

34
serverStatus/views.py
View File

@@ -237,19 +237,33 @@ def servicesStatus(request):
dockerStatus.append(getServiceStats('docker')) dockerStatus.append(getServiceStats('docker'))
# mysql status # mysql status
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
result = s.connect_ex(('127.0.0.1', 3306))
if result == 0: if ProcessUtilities.decideDistro() == ProcessUtilities.centos:
sqlStatus.append(1)
else: mysqlResult = ProcessUtilities.outputExecutioner('systemctl status mysql')
sqlStatus.append(0)
s.close() if mysqlResult.find('active (running)') > -1:
sqlStatus.append(1)
sqlStatus.append(getMemStats('mariadbd'))
else:
sqlStatus.append(0)
sqlStatus.append(0)
if getServiceStats('mysql'):
sqlStatus.append(getMemStats('mysql'))
else: else:
sqlStatus.append(0) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
result = s.connect_ex(('127.0.0.1', 3306))
if result == 0:
sqlStatus.append(1)
else:
sqlStatus.append(0)
s.close()
if getServiceStats('mysql'):
sqlStatus.append(getMemStats('mysql'))
else:
sqlStatus.append(0)
dnsStatus.append(getServiceStats('pdns')) dnsStatus.append(getServiceStats('pdns'))
if getServiceStats('pdns'): if getServiceStats('pdns'):