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

fix dovecot upgrade on ubuntu

Browse Source
This commit is contained in:
Usman Nasir
2021-03-18 15:18:56 +05:00
parent b2d3bab91b
commit 3b725a8523
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
filemanager/static/filemanager/js/codeMirror.js
View File

@@ -88,8 +88,7 @@ fileManager.controller('editFileCtrl', function ($scope, $http, $window) {
cm.setValue(response.data.fileContents); cm.setValue(response.data.fileContents);
cm.setSize(null, 800); cm.setSize(null, 800);
cm.on("keyup", function (cm, event) { cm.on("keyup", function (cm, event) {
if (!cm.state.completionActive && if (!cm.state.completionActive && event.keyCode === 9) {
event.keyCode != 13) {
CodeMirror.commands.autocomplete(cm, null, {completeSingle: false}); CodeMirror.commands.autocomplete(cm, null, {completeSingle: false});
} }
}); });

2
install/install.py
View File

@@ -759,12 +759,14 @@ $cfg['Servers'][$i]['LogoutURL'] = 'phpmyadminsignin.php?logout';
if self.distro == centos: if self.distro == centos:
command = 'yum install --enablerepo=gf-plus -y postfix3 postfix3-ldap postfix3-mysql postfix3-pcre' command = 'yum install --enablerepo=gf-plus -y postfix3 postfix3-ldap postfix3-mysql postfix3-pcre'
elif self.distro == cent8: elif self.distro == cent8:
command = 'dnf --nogpg install -y https://mirror.ghettoforge.org/distributions/gf/el/8/gf/x86_64/gf-release-8-11.gf.el8.noarch.rpm' command = 'dnf --nogpg install -y https://mirror.ghettoforge.org/distributions/gf/el/8/gf/x86_64/gf-release-8-11.gf.el8.noarch.rpm'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
command = 'dnf install --enablerepo=gf-plus postfix3 postfix3-mysql -y' command = 'dnf install --enablerepo=gf-plus postfix3 postfix3-mysql -y'
else: else:
command = 'apt-get -y debconf-utils' command = 'apt-get -y debconf-utils'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)

2
plogical/cPanelImporter.py
View File

@@ -81,7 +81,7 @@ class cPanelImporter:
def PHPDecider(self): def PHPDecider(self):
if self.PHPVersion == 'inherit': if self.PHPVersion == 'inherit':
self.PHPVersion = 'PHP 7.2' self.PHPVersion = 'PHP 7.4'
if self.PHPVersion.find('53') > -1: if self.PHPVersion.find('53') > -1:
self.PHPVersion = 'PHP 5.3' self.PHPVersion = 'PHP 5.3'
elif self.PHPVersion.find('54') > -1: elif self.PHPVersion.find('54') > -1:

3
plogical/upgrade.py
View File

@@ -101,9 +101,10 @@ class Upgrade:
@staticmethod @staticmethod
def executioner(command, component, do_exit=0): def executioner(command, component, do_exit=0):
try: try:
FNULL = open(os.devnull, 'w')
count = 0 count = 0
while True: while True:
res = subprocess.call(shlex.split(command)) res = subprocess.call(shlex.split(command), stdout=FNULL, stderr=subprocess.STDOUT)
if res != 0: if res != 0:
count = count + 1 count = count + 1
Upgrade.stdOut(component + ' failed, trying again, try number: ' + str(count), 0) Upgrade.stdOut(component + ' failed, trying again, try number: ' + str(count), 0)

3
static/filemanager/js/codeMirror.js
View File

@@ -88,8 +88,7 @@ fileManager.controller('editFileCtrl', function ($scope, $http, $window) {
cm.setValue(response.data.fileContents); cm.setValue(response.data.fileContents);
cm.setSize(null, 800); cm.setSize(null, 800);
cm.on("keyup", function (cm, event) { cm.on("keyup", function (cm, event) {
if (!cm.state.completionActive && if (!cm.state.completionActive && event.keyCode === 9) {
event.keyCode != 13) {
CodeMirror.commands.autocomplete(cm, null, {completeSingle: false}); CodeMirror.commands.autocomplete(cm, null, {completeSingle: false});
} }
}); });

2
static/websiteFunctions/websiteFunctions.js
View File

@@ -738,8 +738,6 @@ app.controller('listChildDomainsMain', function ($scope, $http, $timeout) {
type: 'error' type: 'error'
}); });
} }
} }
function cantLoadInitialDatas(response) { function cantLoadInitialDatas(response) {