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

Update some paths and some indenting

Browse Source
This commit is contained in:
rperper
2018-11-06 11:16:50 -05:00
parent d008bfd251
commit 457ff41c69
1 changed files with 104 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
install/install.py
View File

@@ -1394,13 +1394,32 @@ class preFlightsChecks:
return 1
def centos_lib_dir_to_ubuntu(self, filename):
try:
fd = open(filename, 'r')
lines = fd.readlines()
close(fd)
fd = open(filename, 'w')
centos_prefix = '/usr/libexec/'
ubuntu_prefix = '/usr/lib/'
for line in lines:
index = line.find(centos_prefix)
if index != -1:
line = line[:index] + ubuntu_prefix + line[index + len(centos_prefix):]
fd.write(line)
fd.close()
except IOError as err:
self.stdOut("Error converting: " + filename + " from centos defaults to ubuntu defaults: " + str(err), 1,
1, EX_OSERR)
def setup_postfix_davecot_config(self, mysql):
try:
logging.InstallLog.writeToFile("Configuring postfix and dovecot...")
os.chdir(self.cwd)
mysql_virtual_domains = "/etc/postfix/mysql-virtual_domains.cf"
mysql_virtual_forwardings = "/etc/postfix/mysql-virtual_forwardings.cf"
mysql_virtual_mailboxes = "/etc/postfix/mysql-virtual_mailboxes.cf"
@@ -1410,8 +1429,6 @@ class preFlightsChecks:
davecot = "/etc/dovecot/dovecot.conf"
davecotmysql = "/etc/dovecot/dovecot-sql.conf.ext"
if os.path.exists(mysql_virtual_domains):
os.remove(mysql_virtual_domains)
@@ -1484,6 +1501,18 @@ class preFlightsChecks:
# Cleanup config files for ubuntu
if self.distro == ubuntu:
preFlightsChecks.stdOut("Cleanup postfix/dovecot config files", 1)
if mysql == 'Two':
self.centos_lib_dir_to_ubuntu("email-configs/master.cf")
self.centos_lib_dir_to_ubuntu("email-configs/main.cf")
else:
self.centos_lib_dir_to_ubuntu("email-configs-one/master.cf")
self.centos_lib_dir_to_ubuntu("email-configs-one/main.cf")
########### Copy config files
if mysql == 'Two':
@@ -1506,7 +1535,6 @@ class preFlightsChecks:
shutil.copy("email-configs-one/dovecot-sql.conf.ext", davecotmysql)
######################################## Permissions
count = 0