Update some paths and some indenting

install/install.py

@@ -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