diff --git a/install/install.py b/install/install.py index 841d72227..41f38400f 100644 --- a/install/install.py +++ b/install/install.py @@ -12,6 +12,7 @@ import random import socket from os.path import * from stat import * +import stat # There can not be peace without first a great suffering. @@ -901,6 +902,8 @@ class preFlightsChecks: else: writeDataToFile.writelines(items) + os.fchmod(writeDataToFile, stat.S_IRUSR | stat.S_IWUSR) + writeDataToFile.close() logging.InstallLog.writeToFile("settings.py updated!") @@ -1291,107 +1294,117 @@ class preFlightsChecks: def setup_email_Passwords(self,mysqlPassword, mysql): try: - logging.InstallLog.writeToFile("Setting up authentication for Postfix and Dovecot...") + logging.InstallLog.writeToFile("Setting up authentication for Postfix and Dovecot...") - os.chdir(self.cwd) + os.chdir(self.cwd) - if mysql == 'Two': - mysql_virtual_domains = "email-configs/mysql-virtual_domains.cf" - mysql_virtual_forwardings = "email-configs/mysql-virtual_forwardings.cf" - mysql_virtual_mailboxes = "email-configs/mysql-virtual_mailboxes.cf" - mysql_virtual_email2email = "email-configs/mysql-virtual_email2email.cf" - davecotmysql = "email-configs/dovecot-sql.conf.ext" - else: - mysql_virtual_domains = "email-configs-one/mysql-virtual_domains.cf" - mysql_virtual_forwardings = "email-configs-one/mysql-virtual_forwardings.cf" - mysql_virtual_mailboxes = "email-configs-one/mysql-virtual_mailboxes.cf" - mysql_virtual_email2email = "email-configs-one/mysql-virtual_email2email.cf" - davecotmysql = "email-configs-one/dovecot-sql.conf.ext" + if mysql == 'Two': + mysql_virtual_domains = "email-configs/mysql-virtual_domains.cf" + mysql_virtual_forwardings = "email-configs/mysql-virtual_forwardings.cf" + mysql_virtual_mailboxes = "email-configs/mysql-virtual_mailboxes.cf" + mysql_virtual_email2email = "email-configs/mysql-virtual_email2email.cf" + davecotmysql = "email-configs/dovecot-sql.conf.ext" + else: + mysql_virtual_domains = "email-configs-one/mysql-virtual_domains.cf" + mysql_virtual_forwardings = "email-configs-one/mysql-virtual_forwardings.cf" + mysql_virtual_mailboxes = "email-configs-one/mysql-virtual_mailboxes.cf" + mysql_virtual_email2email = "email-configs-one/mysql-virtual_email2email.cf" + davecotmysql = "email-configs-one/dovecot-sql.conf.ext" ### update password: - data = open(davecotmysql, "r").readlines() + data = open(davecotmysql, "r").readlines() - writeDataToFile = open(davecotmysql, "w") + writeDataToFile = open(davecotmysql, "w") - if mysql == 'Two': - dataWritten = "connect = host=127.0.0.1 dbname=cyberpanel user=cyberpanel password="+mysqlPassword+" port=3307\n" - else: - dataWritten = "connect = host=localhost dbname=cyberpanel user=cyberpanel password=" + mysqlPassword + " port=3306\n" + if mysql == 'Two': + dataWritten = "connect = host=127.0.0.1 dbname=cyberpanel user=cyberpanel password="+mysqlPassword+" port=3307\n" + else: + dataWritten = "connect = host=localhost dbname=cyberpanel user=cyberpanel password=" + mysqlPassword + " port=3306\n" - for items in data: - if items.find("connect") > -1: - writeDataToFile.writelines(dataWritten) - else: - writeDataToFile.writelines(items) + for items in data: + if items.find("connect") > -1: + writeDataToFile.writelines(dataWritten) + else: + writeDataToFile.writelines(items) - writeDataToFile.close() + os.fchmod(writeDataToFile, stat.S_IRUSR | stat.S_IWUSR) - ### update password: + writeDataToFile.close() - data = open(mysql_virtual_domains, "r").readlines() + ### update password: - writeDataToFile = open(mysql_virtual_domains, "w") + data = open(mysql_virtual_domains, "r").readlines() - dataWritten = "password = " + mysqlPassword + "\n" + writeDataToFile = open(mysql_virtual_domains, "w") - for items in data: - if items.find("password") > -1: - writeDataToFile.writelines(dataWritten) - else: - writeDataToFile.writelines(items) + dataWritten = "password = " + mysqlPassword + "\n" - writeDataToFile.close() + for items in data: + if items.find("password") > -1: + writeDataToFile.writelines(dataWritten) + else: + writeDataToFile.writelines(items) - ### update password: + os.fchmod(writeDataToFile, stat.S_IRUSR | stat.S_IWUSR) - data = open(mysql_virtual_forwardings, "r").readlines() + writeDataToFile.close() - writeDataToFile = open(mysql_virtual_forwardings, "w") + ### update password: - dataWritten = "password = " + mysqlPassword + "\n" + data = open(mysql_virtual_forwardings, "r").readlines() - for items in data: - if items.find("password") > -1: - writeDataToFile.writelines(dataWritten) - else: - writeDataToFile.writelines(items) + writeDataToFile = open(mysql_virtual_forwardings, "w") - writeDataToFile.close() + dataWritten = "password = " + mysqlPassword + "\n" - ### update password: + for items in data: + if items.find("password") > -1: + writeDataToFile.writelines(dataWritten) + else: + writeDataToFile.writelines(items) - data = open(mysql_virtual_mailboxes, "r").readlines() + os.fchmod(writeDataToFile, stat.S_IRUSR | stat.S_IWUSR) - writeDataToFile = open(mysql_virtual_mailboxes, "w") + writeDataToFile.close() - dataWritten = "password = " + mysqlPassword + "\n" + ### update password: - for items in data: - if items.find("password") > -1: - writeDataToFile.writelines(dataWritten) - else: - writeDataToFile.writelines(items) + data = open(mysql_virtual_mailboxes, "r").readlines() - writeDataToFile.close() + writeDataToFile = open(mysql_virtual_mailboxes, "w") - ### update password: + dataWritten = "password = " + mysqlPassword + "\n" - data = open(mysql_virtual_email2email, "r").readlines() + for items in data: + if items.find("password") > -1: + writeDataToFile.writelines(dataWritten) + else: + writeDataToFile.writelines(items) - writeDataToFile = open(mysql_virtual_email2email, "w") + os.fchmod(writeDataToFile, stat.S_IRUSR | stat.S_IWUSR) - dataWritten = "password = " + mysqlPassword + "\n" + writeDataToFile.close() - for items in data: - if items.find("password") > -1: - writeDataToFile.writelines(dataWritten) - else: - writeDataToFile.writelines(items) + ### update password: - writeDataToFile.close() + data = open(mysql_virtual_email2email, "r").readlines() - logging.InstallLog.writeToFile("Authentication for Postfix and Dovecot set.") + writeDataToFile = open(mysql_virtual_email2email, "w") + + dataWritten = "password = " + mysqlPassword + "\n" + + for items in data: + if items.find("password") > -1: + writeDataToFile.writelines(dataWritten) + else: + writeDataToFile.writelines(items) + + os.fchmod(writeDataToFile, stat.S_IRUSR | stat.S_IWUSR) + + writeDataToFile.close() + + logging.InstallLog.writeToFile("Authentication for Postfix and Dovecot set.") except OSError, msg: logging.InstallLog.writeToFile(str(msg) + " [setup_email_Passwords]") diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py index 05735a1df..6c578a83e 100644 --- a/install/installCyberPanel.py +++ b/install/installCyberPanel.py @@ -9,6 +9,7 @@ import randomPassword import errno import MySQLdb as mariadb import install +import stat #distros centos=0 @@ -869,6 +870,7 @@ class InstallCyberPanel: else: writeDataToFile.writelines(items) + os.fchmod(writeDataToFile, stat.S_IRUSR | stat.S_IWUSR) writeDataToFile.close() logging.InstallLog.writeToFile("PureFTPD configured!") @@ -1028,6 +1030,8 @@ class InstallCyberPanel: else: writeDataToFile.writelines(items) + os.fchmod(writeDataToFile, stat.S_IRUSR | stat.S_IWUSR) + writeDataToFile.close() logging.InstallLog.writeToFile("PowerDNS configured!") @@ -1247,6 +1251,8 @@ def Main(cwd, mysql, distro): password = open(file_name, "w") password.writelines(InstallCyberPanel.mysql_Root_password) + os.fchmod(password, stat.S_IRUSR | stat.S_IWUSR) + password.close() if distro == centos: