diff --git a/IncBackups/IncBackupsControl.py b/IncBackups/IncBackupsControl.py index 52c0b653a..2c62017c4 100644 --- a/IncBackups/IncBackupsControl.py +++ b/IncBackups/IncBackupsControl.py @@ -12,7 +12,7 @@ pass import threading as multi from plogical.processUtilities import ProcessUtilities -from models import IncJob, JobSnapshots +from IncBackups.models import IncJob, JobSnapshots from websiteFunctions.models import Websites import plogical.randomPassword as randomPassword from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging @@ -316,7 +316,7 @@ def prettify(elem): reparsed = minidom.parseString(rough_string) return reparsed.toprettyxml(indent=" ") - ## /home/example.com/backup/backup-example.com-02.13.2018_10-24-52/meta.xml -- metaPath + ## /home/example.com/backup/backup-example-06-50-03-Thu-Feb-2018/meta.xml -- metaPath metaPath = '/home/cyberpanel/%s' % (str(randint(1000, 9999))) @@ -538,4 +538,4 @@ def createBackup(self): except: pass - logging.statusWriter(self.statusPath, 'Completed', 1) + logging.statusWriter(self.statusPath, 'Completed', 1) \ No newline at end of file diff --git a/IncBackups/static/IncBackups/IncBackups.js b/IncBackups/static/IncBackups/IncBackups.js index 36463bbb3..54769c4f1 100644 --- a/IncBackups/static/IncBackups/IncBackups.js +++ b/IncBackups/static/IncBackups/IncBackups.js @@ -491,4 +491,4 @@ app.controller('incrementalDestinations', function ($scope, $http) { }; -}); +}); \ No newline at end of file diff --git a/IncBackups/templates/IncBackups/backupSchedule.html b/IncBackups/templates/IncBackups/backupSchedule.html new file mode 100755 index 000000000..69de37618 --- /dev/null +++ b/IncBackups/templates/IncBackups/backupSchedule.html @@ -0,0 +1,136 @@ +{% extends "baseTemplate/index.html" %} +{% load i18n %} +{% block title %}{% trans "Schedule Back up - CyberPanel" %} {% endblock %} +{% block content %} + + {% load static %} + + {% get_current_language as LANGUAGE_CODE %} + + +
+
+

{% trans "Schedule Back up" %} - {% trans "Remote Backups" %}

+

{% trans "On this page you can schedule Back ups to localhost or remote server (If you have added one)." %}

+
+ +
+
+

+ {% trans "Schedule Back up" %} +

+
+ + +
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ + +
+
+ + + + + +
+ + +
+ +
+

{% trans "Cannot add schedule. Error message:" %} {$ errorMessage $}

+
+ +
+

{% trans "Schedule Added" %}

+
+ +
+

{% trans "Could not connect to server. Please refresh this page." %}

+
+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + +
{% trans "ID" %}{% trans "Destination" %}{% trans "Frequency" %}{% trans "Delete" %}
+
+
+ + + + +
+ + +
+
+
+ + +
+ + +{% endblock %} \ No newline at end of file diff --git a/IncBackups/templates/IncBackups/createBackup.html b/IncBackups/templates/IncBackups/createBackup.html old mode 100644 new mode 100755 diff --git a/IncBackups/urls.py b/IncBackups/urls.py index 6fd05681b..84b305e25 100644 --- a/IncBackups/urls.py +++ b/IncBackups/urls.py @@ -13,4 +13,5 @@ url(r'^deleteBackup$', views.deleteBackup, name='deleteBackupInc'), url(r'^fetchRestorePoints$', views.fetchRestorePoints, name='fetchRestorePointsInc'), url(r'^restorePoint$', views.restorePoint, name='restorePointInc'), + url(r'^scheduleBackups$', views.scheduleBackups, name='scheduleBackupsInc'), ] \ No newline at end of file diff --git a/IncBackups/views.py b/IncBackups/views.py index edfe40d59..0497adc2b 100644 --- a/IncBackups/views.py +++ b/IncBackups/views.py @@ -540,4 +540,29 @@ def restorePoint(request): logging.writeToFile(str(msg)) final_dic = {'status': 0, 'metaStatus': 0, 'error_message': str(msg)} final_json = json.dumps(final_dic) - return HttpResponse(final_json) \ No newline at end of file + return HttpResponse(final_json) + +def scheduleBackups(request): + try: + userID = request.session['userID'] + currentACL = ACLManager.loadedACL(userID) + + if ACLManager.currentContextPermission(currentACL, 'scheDuleBackups') == 0: + return ACLManager.loadError() + + websitesName = ACLManager.findAllSites(currentACL, userID) + + destinations = [] + destinations.append('local') + + path = '/home/cyberpanel/sftp' + + for items in os.listdir(path): + destinations.append('sftp:%s' % (items)) + + for items in os.listdir(path): + destinations.append('s3:s3.amazonaws.com/%s' % (items)) + + return defRenderer(request, 'IncBackups/scheduleBackups.html', {'websiteList': websitesName, 'destinations': destinations}) + except BaseException, msg: + return HttpResponse(str(msg)) \ No newline at end of file diff --git a/README.md b/README.md index daa0159df..11b3c2ecf 100755 --- a/README.md +++ b/README.md @@ -24,7 +24,6 @@ Webhosting control panel that uses OpenLiteSpeed as web server. * PHP 7.0 * PHP 7.1 * PHP 7.2 -* PHP 7.3 # Installation Instructions diff --git a/backup/backupManager.py b/backup/backupManager.py old mode 100644 new mode 100755 diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html old mode 100644 new mode 100755 index 0095a26ba..cdb5d524d --- a/baseTemplate/templates/baseTemplate/index.html +++ b/baseTemplate/templates/baseTemplate/index.html @@ -601,6 +601,9 @@
  • {% trans "Add Destinations" %}
    • +
  • {% trans "Schedule Back ups" %} +
    • diff --git a/cli/cliLogger.py b/cli/cliLogger.py old mode 100644 new mode 100755 diff --git a/emailPremium/templates/emailPremium/emailPage.html b/emailPremium/templates/emailPremium/emailPage.html old mode 100644 new mode 100755 diff --git a/emailPremium/templates/emailPremium/listDomains.html b/emailPremium/templates/emailPremium/listDomains.html old mode 100644 new mode 100755 index fe547101b..6f9f0642e --- a/emailPremium/templates/emailPremium/listDomains.html +++ b/emailPremium/templates/emailPremium/listDomains.html @@ -106,4 +106,4 @@

    {% trans "Email Policy Server is not enabled " %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/emailPremium/templates/emailPremium/policyServer.html b/emailPremium/templates/emailPremium/policyServer.html old mode 100644 new mode 100755 diff --git a/firewall/templates/firewall/index.html b/firewall/templates/firewall/index.html old mode 100644 new mode 100755 index 4f694aab2..74f1109a4 --- a/firewall/templates/firewall/index.html +++ b/firewall/templates/firewall/index.html @@ -85,7 +85,7 @@

    - + diff --git a/install/install.py b/install/install.py old mode 100644 new mode 100755 index 74bed45d2..7637ea805 --- a/install/install.py +++ b/install/install.py @@ -17,8 +17,8 @@ from random import choice char_set = {'small': 'abcdefghijklmnopqrstuvwxyz', - 'nums': '0123456789', - 'big': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', + 'nums': '0123456789', + 'big': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', } @@ -37,6 +37,7 @@ def generate_pass(length=14): password.append(a_char) return ''.join(password) + def check_prev_char(password, current_char_set): """Function to ensure that there are no consecutive UPPERCASE/lowercase/numbers/special-characters.""" @@ -59,6 +60,7 @@ def check_prev_char(password, current_char_set): centos = 0 ubuntu = 1 + def get_distro(): distro = -1 distro_file = "" @@ -175,7 +177,6 @@ def mountTemp(self): 'mountTemp', 1, 0, os.EX_OSERR) - tmp = "/usr/.tempdisk /tmp ext4 loop,rw,noexec,nosuid,nodev,nofail 0 0\n" varTmp = "/tmp /var/tmp none bind 0 0\n" @@ -333,7 +334,6 @@ def setup_account_cyberpanel(self): else: command = "adduser docker" - preFlightsChecks.call(command, self.distro, '[setup_account_cyberpanel]', 'add user cyberpanel', 1, 0, os.EX_OSERR) @@ -353,7 +353,6 @@ def setup_account_cyberpanel(self): 'add user cyberpanel', 1, 0, os.EX_OSERR) - ### command = "mkdir -p /etc/letsencrypt/live/" @@ -943,8 +942,8 @@ def download_install_CyberPanel(self, mysqlPassword, mysql): if subprocess.check_output('systemd-detect-virt').find("openvz") > -1: command = "pip install --upgrade requests" preFlightsChecks.call(command, self.distro, '[download_install_CyberPanel]', - 'Upgrade requests', - 1, 0, os.EX_OSERR) + 'Upgrade requests', + 1, 0, os.EX_OSERR) except: pass @@ -953,18 +952,18 @@ def download_install_CyberPanel(self, mysqlPassword, mysql): os.chdir(self.path) command = "wget http://cyberpanel.sh/CyberPanel.1.9.0.tar.gz" - #command = "wget http://cyberpanel.sh/CyberPanelTemp.tar.gz" + # command = "wget http://cyberpanel.sh/CyberPanelTemp.tar.gz" preFlightsChecks.call(command, self.distro, '[download_install_CyberPanel]', - 'CyberPanel Download', - 1, 1, os.EX_OSERR) + 'CyberPanel Download', + 1, 1, os.EX_OSERR) ## count = 0 command = "tar zxf CyberPanel.1.9.0.tar.gz" - #command = "tar zxf CyberPanelTemp.tar.gz" + # command = "tar zxf CyberPanelTemp.tar.gz" preFlightsChecks.call(command, self.distro, '[download_install_CyberPanel]', - 'Extract CyberPanel',1, 1, os.EX_OSERR) + 'Extract CyberPanel', 1, 1, os.EX_OSERR) ### update password: @@ -1016,8 +1015,6 @@ def download_install_CyberPanel(self, mysqlPassword, mysql): else: writeDataToFile.writelines(items) - - if self.distro == ubuntu: os.fchmod(writeDataToFile.fileno(), stat.S_IRUSR | stat.S_IWUSR) @@ -1029,20 +1026,18 @@ def download_install_CyberPanel(self, mysqlPassword, mysql): ### Applying migrations - os.chdir("CyberCP") command = "/usr/local/CyberCP/bin/python2 manage.py makemigrations" preFlightsChecks.call(command, self.distro, '[download_install_CyberPanel]', - 'CyberPanel Make Migrations', - 1, 1, os.EX_OSERR) + 'CyberPanel Make Migrations', + 1, 1, os.EX_OSERR) ## command = "/usr/local/CyberCP/bin/python2 manage.py migrate" preFlightsChecks.call(command, self.distro, '[download_install_CyberPanel]', - 'CyberPanel Migrate',1, 1, os.EX_OSERR) - + 'CyberPanel Migrate', 1, 1, os.EX_OSERR) if not os.path.exists("/usr/local/CyberCP/public"): os.mkdir("/usr/local/CyberCP/public") @@ -1050,7 +1045,7 @@ def download_install_CyberPanel(self, mysqlPassword, mysql): ## Moving static content to lscpd location command = 'mv static /usr/local/CyberCP/public/' preFlightsChecks.call(command, self.distro, '[download_install_CyberPanel]', - 'Move static content', 1, 1, os.EX_OSERR) + 'Move static content', 1, 1, os.EX_OSERR) try: path = "/usr/local/CyberCP/version.txt" @@ -1144,23 +1139,26 @@ def fixCyberPanelPermissions(self): 'Change permissions for client.', 1, 0, os.EX_OSERR) files = ['/etc/yum.repos.d/MariaDB.repo', '/etc/pdns/pdns.conf', '/etc/systemd/system/lscpd.service', - '/etc/pure-ftpd/pure-ftpd.conf', '/etc/pure-ftpd/pureftpd-pgsql.conf', '/etc/pure-ftpd/pureftpd-mysql.conf', '/etc/pure-ftpd/pureftpd-ldap.conf', - '/etc/dovecot/dovecot.conf', '/usr/local/lsws/conf/httpd_config.xml', '/usr/local/lsws/conf/modsec.conf', '/usr/local/lsws/conf/httpd.conf'] + '/etc/pure-ftpd/pure-ftpd.conf', '/etc/pure-ftpd/pureftpd-pgsql.conf', + '/etc/pure-ftpd/pureftpd-mysql.conf', '/etc/pure-ftpd/pureftpd-ldap.conf', + '/etc/dovecot/dovecot.conf', '/usr/local/lsws/conf/httpd_config.xml', + '/usr/local/lsws/conf/modsec.conf', '/usr/local/lsws/conf/httpd.conf'] for items in files: command = 'chmod 644 %s' % (items) preFlightsChecks.call(command, self.distro, '[fixCyberPanelPermissions]', 'Change permissions for client.', 1, 0, os.EX_OSERR) - impFile = ['/etc/pure-ftpd/pure-ftpd.conf', '/etc/pure-ftpd/pureftpd-pgsql.conf', '/etc/pure-ftpd/pureftpd-mysql.conf', '/etc/pure-ftpd/pureftpd-ldap.conf', - '/etc/dovecot/dovecot.conf', '/etc/pdns/pdns.conf', '/etc/pure-ftpd/db/mysql.conf', '/etc/powerdns/pdns.conf'] + impFile = ['/etc/pure-ftpd/pure-ftpd.conf', '/etc/pure-ftpd/pureftpd-pgsql.conf', + '/etc/pure-ftpd/pureftpd-mysql.conf', '/etc/pure-ftpd/pureftpd-ldap.conf', + '/etc/dovecot/dovecot.conf', '/etc/pdns/pdns.conf', '/etc/pure-ftpd/db/mysql.conf', + '/etc/powerdns/pdns.conf'] for items in impFile: command = 'chmod 600 %s' % (items) preFlightsChecks.call(command, self.distro, '[fixCyberPanelPermissions]', 'Change permissions for client.', 1, 0, os.EX_OSERR) - command = 'chmod 640 /etc/postfix/*.cf' subprocess.call(command, shell=True) @@ -1200,7 +1198,7 @@ def install_unzip(self): command = 'apt-get -y install unzip' preFlightsChecks.call(command, self.distro, '[install_unzip]', - 'Install unzip', 1, 0, os.EX_OSERR) + 'Install unzip', 1, 0, os.EX_OSERR) except BaseException, msg: logging.InstallLog.writeToFile(str(msg) + " [install_unzip]") @@ -1213,7 +1211,7 @@ def install_zip(self): command = 'apt-get -y install zip' preFlightsChecks.call(command, self.distro, '[install_zip]', - 'Install zip', 1, 0, os.EX_OSERR) + 'Install zip', 1, 0, os.EX_OSERR) except BaseException, msg: logging.InstallLog.writeToFile(str(msg) + " [install_zip]") @@ -1227,7 +1225,7 @@ def download_install_phpmyadmin(self): command = 'composer create-project phpmyadmin/phpmyadmin' preFlightsChecks.call(command, self.distro, '[download_install_phpmyadmin]', - 'Download PHPMYAdmin', 1, 0, os.EX_OSERR) + 'Download PHPMYAdmin', 1, 0, os.EX_OSERR) ## Write secret phrase @@ -1259,7 +1257,6 @@ def download_install_phpmyadmin(self): ###################################################### Email setup - def install_postfix_davecot(self): self.stdOut("Install dovecot - first remove postfix") @@ -1275,14 +1272,12 @@ def install_postfix_davecot(self): writeToFile.write(content) writeToFile.close() - try: if self.distro == centos: command = 'yum -y install http://cyberpanel.sh/gf-release-latest.gf.el7.noarch.rpm' subprocess.call(shlex.split(command)) - command = 'yum remove postfix -y' else: command = 'apt-get -y remove postfix' @@ -1372,7 +1367,6 @@ def install_postfix_davecot(self): preFlightsChecks.stdOut("Dovecot and Dovecot-MySQL successfully installed!") break - if self.distro != centos: command = 'curl https://repo.dovecot.org/DOVECOT-REPO-GPG | gpg --import' subprocess.call(command, shell=True) @@ -1601,7 +1595,6 @@ def setup_postfix_davecot_config(self, mysql): if os.path.exists(davecotmysql): os.remove(davecotmysql) - ###############Getting SSL count = 0 @@ -2104,7 +2097,6 @@ def setup_postfix_davecot_config(self, mysql): break ## - count = 0 while (1): @@ -2155,7 +2147,6 @@ def setup_postfix_davecot_config(self, mysql): ## - count = 0 while (1): @@ -2349,13 +2340,11 @@ def downoad_and_install_raindloop(self): else: logging.InstallLog.writeToFile("Rainloop permissions changed!") print( - "[" + time.strftime("%m.%d.%Y_%H-%M-%S") + "] " + "Rainloop permissions changed!") + "[" + time.strftime("%m.%d.%Y_%H-%M-%S") + "] " + "Rainloop permissions changed!") break ############# - - count = 0 while (1): @@ -2383,7 +2372,6 @@ def downoad_and_install_raindloop(self): 'rainlooop data folder', 1, 0, os.EX_OSERR) - ### Enable sub-folders command = "mkdir -p /usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/configs/" @@ -2429,7 +2417,6 @@ def downoad_and_install_raindloop(self): ###################################################### Email setup ends! - def reStartLiteSpeed(self): try: count = 0 @@ -2491,7 +2478,6 @@ def installFirewalld(self): 'Install FirewallD', 1, 0, os.EX_OSERR) - ###### if self.distro == centos: # Not available in ubuntu @@ -2510,7 +2496,6 @@ def installFirewalld(self): 'Restart FirewallD', 1, 0, os.EX_OSERR) - ########## command = 'systemctl enable firewalld' @@ -2518,8 +2503,6 @@ def installFirewalld(self): 'Install FirewallD', 1, 0, os.EX_OSERR) - - FirewallUtilities.addRule("tcp", "8090") FirewallUtilities.addRule("tcp", "80") FirewallUtilities.addRule("tcp", "443") @@ -2550,7 +2533,6 @@ def installFirewalld(self): ## from here - def installLSCPD(self): try: @@ -2564,8 +2546,8 @@ def installLSCPD(self): command = 'yum -y install gcc gcc-c++ make autoconf glibc rcs' preFlightsChecks.call(command, self.distro, '[installLSCPD]', - 'Install LSCPD', - 1, 1, os.EX_OSERR) + 'Install LSCPD', + 1, 1, os.EX_OSERR) if self.distro == ubuntu: command = "apt-get -y install libpcre3 libpcre3-dev openssl libexpat1 libexpat1-dev libgeoip-dev" \ @@ -2575,24 +2557,22 @@ def installLSCPD(self): ' which curl' preFlightsChecks.call(command, self.distro, '[installLSCPD]', - 'Install LSCPD', - 1, 1, os.EX_OSERR) - + 'Install LSCPD', + 1, 1, os.EX_OSERR) command = 'tar zxf lscp.tar.gz -C /usr/local/' preFlightsChecks.call(command, self.distro, '[installLSCPD]', - 'Install LSCPD', - 1, 1, os.EX_OSERR) - + 'Install LSCPD', + 1, 1, os.EX_OSERR) command = 'openssl req -newkey rsa:1024 -new -nodes -x509 -days 3650 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=www.example.com" -keyout /usr/local/lscp/conf/key.pem -out /usr/local/lscp/conf/cert.pem' preFlightsChecks.call(command, self.distro, '[installLSCPD]', - 'Install LSCPD', - 1, 1, os.EX_OSERR) + 'Install LSCPD', + 1, 1, os.EX_OSERR) try: os.remove("/usr/local/lscp/fcgi-bin/lsphp") - shutil.copy("/usr/local/lsws/lsphp70/bin/lsphp","/usr/local/lscp/fcgi-bin/lsphp") + shutil.copy("/usr/local/lsws/lsphp70/bin/lsphp", "/usr/local/lscp/fcgi-bin/lsphp") except: pass @@ -2602,25 +2582,25 @@ def installLSCPD(self): command = 'useradd lscpd -M -d /usr/local/lscp' preFlightsChecks.call(command, self.distro, '[installLSCPD]', - 'Install LSCPD', - 1, 0, os.EX_OSERR) + 'Install LSCPD', + 1, 0, os.EX_OSERR) if self.distro == centos: command = 'groupadd lscpd' preFlightsChecks.call(command, self.distro, '[installLSCPD]', - 'Install LSCPD', - 1, 0, os.EX_OSERR) + 'Install LSCPD', + 1, 0, os.EX_OSERR) # Added group in useradd for Ubuntu command = 'usermod -a -G lscpd lscpd' preFlightsChecks.call(command, self.distro, '[installLSCPD]', - 'Install LSCPD', - 1, 0, os.EX_OSERR) + 'Install LSCPD', + 1, 0, os.EX_OSERR) command = 'usermod -a -G lsadm lscpd' preFlightsChecks.call(command, self.distro, '[installLSCPD]', - 'Install LSCPD', - 1, 0, os.EX_OSERR) + 'Install LSCPD', + 1, 0, os.EX_OSERR) try: os.mkdir('/usr/local/lscp/cyberpanel') except: @@ -2630,7 +2610,7 @@ def installLSCPD(self): except: pass - #self.setupComodoRules() + # self.setupComodoRules() self.setupPort() self.setupPythonWSGI() @@ -2647,8 +2627,8 @@ def setupComodoRules(self): command = "mkdir -p /usr/local/lscp/modsec" preFlightsChecks.call(command, self.distro, '[setupComodoRules]', - 'setupComodoRules', - 1, 0, os.EX_OSERR) + 'setupComodoRules', + 1, 0, os.EX_OSERR) try: if os.path.exists('comodo.tar.gz'): @@ -2658,13 +2638,13 @@ def setupComodoRules(self): command = "wget https://cyberpanel.net/modsec/comodo.tar.gz" result = preFlightsChecks.call(command, self.distro, '[setupComodoRules]', - 'setupComodoRules', - 1, 0, os.EX_OSERR) + 'setupComodoRules', + 1, 0, os.EX_OSERR) command = "tar -zxf comodo.tar.gz -C /usr/local/lscp/modsec" preFlightsChecks.call(command, self.distro, '[setupComodoRules]', - 'setupComodoRules', - 1, 0, os.EX_OSERR) + 'setupComodoRules', + 1, 0, os.EX_OSERR) ### @@ -2725,8 +2705,8 @@ def setupComodoRules(self): command = "chown -R lscpd:lscpd /usr/local/lscp/modsec" preFlightsChecks.call(command, self.distro, '[setupComodoRules]', - 'setupComodoRules', - 1, 0, os.EX_OSERR) + 'setupComodoRules', + 1, 0, os.EX_OSERR) return 1 @@ -2834,7 +2814,6 @@ def setupLSCPDDaemon(self): writeToFile.write("abc\n") writeToFile.close() - command = "chmod 600 " + path cmd = shlex.split(command) res = subprocess.call(cmd) @@ -3261,13 +3240,14 @@ def installTLDExtract(self): def installPYDNS(self): command = "pip install pydns" preFlightsChecks.call(command, self.distro, '[installPYDNS]', - 'Install PYDNS', - 1, 0, os.EX_OSERR) + 'Install PYDNS', + 1, 0, os.EX_OSERR) + def installDockerPY(self): command = "pip install docker" preFlightsChecks.call(command, self.distro, '[installDockerPY]', - 'Install DockerPY', - 1, 0, os.EX_OSERR) + 'Install DockerPY', + 1, 0, os.EX_OSERR) def installOpenDKIM(self): try: @@ -3530,7 +3510,6 @@ def setupVirtualEnv(distro): ## - count = 0 while (1): command = "pip install virtualenv" @@ -3795,13 +3774,12 @@ def main(): checks.setup_gunicorn() import installCyberPanel - + if ent == 0: installCyberPanel.Main(cwd, mysql, distro, ent, None, port, args.ftp, args.powerdns) else: installCyberPanel.Main(cwd, mysql, distro, ent, serial, port, args.ftp, args.powerdns) - checks.setupPHPAndComposer() checks.fix_selinux_issue() checks.install_psmisc() @@ -3822,7 +3800,6 @@ def main(): checks.installFirewalld() - checks.install_python_requests() checks.install_default_keys() @@ -3853,7 +3830,6 @@ def main(): checks.setupLSCPDDaemon() checks.fixCyberPanelPermissions() - if args.postfix != None: checks.enableDisableEmail(args.postfix) else: @@ -3872,7 +3848,6 @@ def main(): preFlightsChecks.stdOut("Pure-FTPD will be installed and enabled.") checks.enableDisableFTP('On', distro) - checks.setUpFirstAccount() logging.InstallLog.writeToFile("CyberPanel installation successfully completed!") checks.installation_successfull() diff --git a/install/installLog.py b/install/installLog.py old mode 100644 new mode 100755 diff --git a/locale/br/LC_MESSAGES/django.po b/locale/br/LC_MESSAGES/django.po index 64582e111..2e77baac4 100755 --- a/locale/br/LC_MESSAGES/django.po +++ b/locale/br/LC_MESSAGES/django.po @@ -3692,7 +3692,7 @@ msgstr "SpamAssassin конфигурация е успешно променен #: emailPremium/templates/emailPremium/emailPage.html:13 #: emailPremium/templates/emailPremium/listDomains.html:14 #: emailPremium/templates/emailPremium/policyServer.html:13 -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "Email лимити документация" #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/locale/bs/LC_MESSAGES/django.po b/locale/bs/LC_MESSAGES/django.po index 0af46625b..7a7e7d31e 100755 --- a/locale/bs/LC_MESSAGES/django.po +++ b/locale/bs/LC_MESSAGES/django.po @@ -3835,7 +3835,7 @@ msgstr " uspješno je kreiran." #: emailPremium/templates/emailPremium/policyServer.html:13 #, fuzzy #| msgid "Email Logs" -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "Email logovi" #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/locale/cn/LC_MESSAGES/django.po b/locale/cn/LC_MESSAGES/django.po index 81c451f14..4779386d5 100755 --- a/locale/cn/LC_MESSAGES/django.po +++ b/locale/cn/LC_MESSAGES/django.po @@ -3773,7 +3773,7 @@ msgstr " 已成功创建." #: emailPremium/templates/emailPremium/policyServer.html:13 #, fuzzy #| msgid "Email Logs" -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "Email日志" #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index f16b34caa..92a6d8b8a 100755 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -3780,7 +3780,7 @@ msgstr "" #: emailPremium/templates/emailPremium/emailPage.html:13 #: emailPremium/templates/emailPremium/listDomains.html:14 #: emailPremium/templates/emailPremium/policyServer.html:13 -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "" #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index e5c9c5ba4..0f3b6d45a 100755 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3706,7 +3706,7 @@ msgstr "Les configurations de SpamAssassin ont été enregistrées avec succès. #: emailPremium/templates/emailPremium/emailPage.html:13 #: emailPremium/templates/emailPremium/listDomains.html:14 #: emailPremium/templates/emailPremium/policyServer.html:13 -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "Limites de messagerie documentations" #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/locale/gr/LC_MESSAGES/django.po b/locale/gr/LC_MESSAGES/django.po index a4c103bfe..b9795b6c6 100755 --- a/locale/gr/LC_MESSAGES/django.po +++ b/locale/gr/LC_MESSAGES/django.po @@ -3848,7 +3848,7 @@ msgstr "δημιουργήθηκε με επιτυχία." #: emailPremium/templates/emailPremium/policyServer.html:13 #, fuzzy #| msgid "Email Logs" -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "Αρχεία καταγραφής Email " #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/locale/id/LC_MESSAGES/django.po b/locale/id/LC_MESSAGES/django.po index 412fa91e9..60810defd 100755 --- a/locale/id/LC_MESSAGES/django.po +++ b/locale/id/LC_MESSAGES/django.po @@ -3437,7 +3437,7 @@ msgstr "" #: emailPremium/templates/emailPremium/emailPage.html:13 #: emailPremium/templates/emailPremium/listDomains.html:14 #: emailPremium/templates/emailPremium/policyServer.html:13 -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "" #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/locale/it/LC_MESSAGES/django.po b/locale/it/LC_MESSAGES/django.po index f2c7a51a3..641aabe0f 100755 --- a/locale/it/LC_MESSAGES/django.po +++ b/locale/it/LC_MESSAGES/django.po @@ -3803,7 +3803,7 @@ msgstr "Le configurazioni di SpamAssassin sono state salvate correttamente." #: emailPremium/templates/emailPremium/policyServer.html:13 #, fuzzy #| msgid "Email Logs" -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "Documentazione Limiti Email" #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/locale/ja/LC_MESSAGES/django.po b/locale/ja/LC_MESSAGES/django.po index 6eb63f9c8..2799ded15 100755 --- a/locale/ja/LC_MESSAGES/django.po +++ b/locale/ja/LC_MESSAGES/django.po @@ -3682,7 +3682,7 @@ msgstr "SpamAssassin 設定が保存されました。" #: emailPremium/templates/emailPremium/emailPage.html:13 #: emailPremium/templates/emailPremium/listDomains.html:14 #: emailPremium/templates/emailPremium/policyServer.html:13 -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "Eメールの制限ドキュメント" #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/locale/pl/LC_MESSAGES/django.po b/locale/pl/LC_MESSAGES/django.po index 11ce10080..995998181 100755 --- a/locale/pl/LC_MESSAGES/django.po +++ b/locale/pl/LC_MESSAGES/django.po @@ -3676,7 +3676,7 @@ msgstr "Pomyślnie zapisano konfigurację SpamAssassin." #: emailPremium/templates/emailPremium/emailPage.html:13 #: emailPremium/templates/emailPremium/listDomains.html:14 #: emailPremium/templates/emailPremium/policyServer.html:13 -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "Limity poczty dokumentacja" #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index fe5c85a00..98b93b48b 100755 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -3845,7 +3845,7 @@ msgstr " foi criado com sucesso." #: emailPremium/templates/emailPremium/policyServer.html:13 #, fuzzy #| msgid "Email Logs" -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "Logs de E-Mail" #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po index c477cd703..e03a8eef8 100755 --- a/locale/ru/LC_MESSAGES/django.po +++ b/locale/ru/LC_MESSAGES/django.po @@ -3801,7 +3801,7 @@ msgstr "Успешно запущен процесс резервного коп #: emailPremium/templates/emailPremium/policyServer.html:13 #, fuzzy #| msgid "Email Logs" -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "Лог-журнал Эл.почты" #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/locale/tr/LC_MESSAGES/django.po b/locale/tr/LC_MESSAGES/django.po index ea1ce37c3..20b2514f4 100755 --- a/locale/tr/LC_MESSAGES/django.po +++ b/locale/tr/LC_MESSAGES/django.po @@ -3775,7 +3775,7 @@ msgstr "Yedekleme işlemi başarıyla başlatıldı." #: emailPremium/templates/emailPremium/policyServer.html:13 #, fuzzy #| msgid "Email Logs" -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "Eposta günlükleri" #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index c3ce50232..e1d7ae77c 100755 --- a/locale/vi/LC_MESSAGES/django.po +++ b/locale/vi/LC_MESSAGES/django.po @@ -3674,7 +3674,7 @@ msgstr "Đã lưu thành công cấu hình SpamAssassin." #: emailPremium/templates/emailPremium/emailPage.html:13 #: emailPremium/templates/emailPremium/listDomains.html:14 #: emailPremium/templates/emailPremium/policyServer.html:13 -msgid "Email Limits Docs" +msgid "Emai Limits Docs" msgstr "Tài liệu giới hạn Emai" #: emailPremium/templates/emailPremium/emailLimits.html:14 diff --git a/loginSystem/templates/loginSystem/login.html b/loginSystem/templates/loginSystem/login.html old mode 100644 new mode 100755 diff --git a/plogical/CyberCPLogFileWriter.py b/plogical/CyberCPLogFileWriter.py old mode 100644 new mode 100755 diff --git a/plogical/backupSchedule.py b/plogical/backupSchedule.py old mode 100644 new mode 100755 diff --git a/plogical/backupScheduleLocal.py b/plogical/backupScheduleLocal.py old mode 100644 new mode 100755 diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py old mode 100644 new mode 100755 diff --git a/plogical/csf.py b/plogical/csf.py old mode 100644 new mode 100755 index cd1f2108f..181318bd2 --- a/plogical/csf.py +++ b/plogical/csf.py @@ -497,7 +497,7 @@ def blockIP(ipAddress): except BaseException, msg: logging.CyberCPLogFileWriter.writeToFile(str(msg) + "[blockIP]") - + @staticmethod def run_command(command): p = subprocess.Popen(command, stdout=subprocess.PIPE, @@ -507,8 +507,8 @@ def run_command(command): @staticmethod def checkIP(ipAddress): try: - command = "sudo csf -g ' + ipAddress.split() - for line in run_command(command): + command = "sudo csf -g ' + ipAddress.split()" + for line in CSF.run_command(command): print(line) except BaseException, msg: diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py old mode 100644 new mode 100755 diff --git a/plogical/mysqlUtilities.py b/plogical/mysqlUtilities.py old mode 100644 new mode 100755 diff --git a/plogical/processUtilities.py b/plogical/processUtilities.py old mode 100644 new mode 100755 diff --git a/plogical/remoteBackup.py b/plogical/remoteBackup.py old mode 100644 new mode 100755 diff --git a/plogical/remoteTransferUtilities.py b/plogical/remoteTransferUtilities.py old mode 100644 new mode 100755 diff --git a/plogical/upgrade.py b/plogical/upgrade.py old mode 100644 new mode 100755 diff --git a/pluginInstaller/pluginInstaller.py b/pluginInstaller/pluginInstaller.py old mode 100644 new mode 100755 diff --git a/postfixSenderPolicy/accept_traffic.py b/postfixSenderPolicy/accept_traffic.py old mode 100644 new mode 100755 diff --git a/s3Backups/s3Backups.py b/s3Backups/s3Backups.py old mode 100644 new mode 100755