Updated installer to make it more portable.

mdshort

2007-08-16 20218c0bd77cfda46d28d211e80162373c03df13

Updated installer to make it more portable.

 install/dist/conf/debian40.conf.php

@@ -1,72 +1,67 @@
<?php

$conf["language"] = "en";
$conf["distname"] = "debian40";
$conf["hostname"] = "server1.example.com"; // Full hostname
$conf["ispconfig_install_dir"] = "/usr/local/ispconfig";
$conf["ispconfig_config_dir"] = "/usr/local/ispconfig";
$conf["server_id"] = 1;

/*
    Distribution specific settings
*/

$conf["dist_init_scripts"] = "/etc/init.d";
$conf["dist_runlevel"] = "/etc";
$conf["dist_shells"] = "/etc/shells";
$conf["dist_cron_tab"] = "/var/spool/cron/crontabs/root";
// Main
$dist["init_scripts"] = "/etc/init.d";
$dist["runlevel"] = "/etc";
$dist["shells"] = "/etc/shells";
$dist["cron_tab"] = "/var/spool/cron/crontabs/root";
$dist["pam"] = "/etc/pam.d";

// MySQL
$dist["mysql"]["init_script"] = "mysql";

// Apache
$conf["dist_apache_user"] = "www-data";
$conf["dist_apache_group"] = "www-data";
$conf["dist_apache_init_script"] = "apache2";
$conf["dist_apache_version"] = "2.2";
$conf["dist_apache_vhost_conf_dir"] = "/etc/apache2/sites-available";
$conf["dist_apache_vhost_conf_enabled_dir"] = "/etc/apache2/sites-enabled";
$dist["apache"]["user"] = "www-data";
$dist["apache"]["group"] = "www-data";
$dist["apache"]["init_script"] = "apache2";
$dist["apache"]["version"] = "2.2";
$dist["apache"]["vhost_dist_dir"] = "/etc/apache2/sites-available";
$dist["apache"]["vhost_dist_enabled_dir"] = "/etc/apache2/sites-enabled";

// Postfix
$conf["dist_postfix_config_dir"] = "/etc/postfix";
$conf["dist_postfix_username"] = "postfix";
$conf["dist_postfix_groupname"] = "postfix";
$conf["dist_postfix_vmail_userid"] = "5000";
$conf["dist_postfix_vmail_username"] = "vmail";
$conf["dist_postfix_vmail_groupid"] = "5000";
$conf["dist_postfix_vmail_groupname"] = "vmail";
$conf["dist_postfix_vmail_mailbox_base"] = "/home/vmail";
$dist["postfix"]["config_dir"] = "/etc/postfix";
$dist["postfix"]["init_script"] = "postfix";
$dist["postfix"]["user"] = "postfix";
$dist["postfix"]["group"] = "postfix";
$dist["postfix"]["vmail_userid"] = "5000";
$dist["postfix"]["vmail_username"] = "vmail";
$dist["postfix"]["vmail_groupid"] = "5000";
$dist["postfix"]["vmail_groupname"] = "vmail";
$dist["postfix"]["vmail_mailbox_base"] = "/home/vmail";

// Getmail
$conf["dist_getmail_config_dir"] = "/etc/getmail";
$conf["dist_getmail_program"] = "/usr/bin/getmail";
$dist["getmail"]["config_dir"] = "/etc/getmail";
$dist["getmail"]["program"] = "/usr/bin/getmail";

// Courier
$conf["dist_courier_config_dir"] = "/etc/courier";
$dist["courier"]["config_dir"] = "/etc/courier";
$dist["courier"]["courier-authdaemon"] = "courier-authdaemon";
$dist["courier"]["courier-imap"] = "courier-imap";
$dist["courier"]["courier-imap-ssl"] = "courier-imap-ssl";
$dist["courier"]["courier-pop"] = "courier-pop";
$dist["courier"]["courier-pop-ssl"] = "courier-pop-ssl";

// SASL
$dist["saslauthd"]["config"] = "/etc/default/saslauthd";
$dist["saslauthd"]["init_script"] = "saslauthd";

// Amavisd
$conf["dist_amavis_config_dir"] = "/etc/amavis";
$dist["amavis"]["config_dir"] = "/etc/amavis";
$dist["amavis"]["init_script"] = "amavis";

// ClamAV
$dist["clamav"]["init_script"] = "clamav-daemon";

// Pureftpd
$conf["dist_pureftpd_config_dir"] = "/etc/pure-ftpd/db";
$dist["pureftpd"]["config_dir"] = "/etc/pure-ftpd";
$dist["pureftpd"]["init_script"] = "pure-ftpd-mysql";

// MyDNS
$conf["dist_mydns_config_dir"] = "/etc";
$dist["mydns"]["config_dir"] = "/etc";
$dist["mydns"]["init_script"] = "mydns";

/*
    MySQL Database settings
*/
$conf["mysql_server_host"] = "localhost";
$conf["mysql_server_ip"] = "127.0.0.1";
$conf["mysql_server_port"] = "3306";
$conf["mysql_server_database"] = "dbispconfig";
$conf["mysql_server_admin_user"] = "root";
$conf["mysql_server_admin_password"] = "";
$conf["mysql_server_ispconfig_user"] = "ispconfig";
$conf["mysql_server_ispconfig_password"] = "5sDrewBhk";








?>
?>

 install/dist/conf/gentoo.conf.php

New file
@@ -0,0 +1,67 @@
<?php

/*
    Distribution specific settings
*/

// Main
$dist["init_scripts"] = "/etc/init.d";
$dist["runlevel"] = "/etc";
$dist["shells"] = "/etc/shells";
$dist["cron_tab"] = "/var/spool/cron/crontabs/root";
$dist["pam"] = "/etc/pam.d";

// MySQL
$dist["mysql"]["init_script"] = "mysql";

// Apache
$dist["apache"]["user"] = "apache";
$dist["apache"]["group"] = "apache";
$dist["apache"]["init_script"] = "apache2";
$dist["apache"]["version"] = "2.2";
$dist["apache"]["vhost_dist_dir"] = "/etc/apache2/vhosts.d";
$dist["apache"]["vhost_dist_enabled_dir"] = "/etc/apache2/vhosts.d";

// Postfix
$dist["postfix"]["config_dir"] = "/etc/postfix";
$dist["postfix"]["init_script"] = "postfix";
$dist["postfix"]["user"] = "postfix";
$dist["postfix"]["group"] = "postfix";
$dist["postfix"]["vmail_userid"] = "5000";
$dist["postfix"]["vmail_username"] = "vmail";
$dist["postfix"]["vmail_groupid"] = "5000";
$dist["postfix"]["vmail_groupname"] = "vmail";
$dist["postfix"]["vmail_mailbox_base"] = "/home/vmail";

// Getmail
$dist["getmail"]["config_dir"] = "/etc/getmail";
$dist["getmail"]["program"] = "/usr/bin/getmail";

// Courier
$dist["courier"]["config_dir"] = "/etc/courier";
$dist["courier"]["courier-authdaemon"] = "courier-authlib";
$dist["courier"]["courier-imap"] = "courier-imapd";
$dist["courier"]["courier-imap-ssl"] = "courier-imapd-ssl";
$dist["courier"]["courier-pop"] = "courier-pop3d";
$dist["courier"]["courier-pop-ssl"] = "courier-pop3d-ssl";

// SASL
$dist["saslauthd"]["config"] = "/etc/default/saslauthd";
$dist["saslauthd"]["init_script"] = "saslauthd";

// Amavisd
$dist["amavis"]["config_dir"] = "/etc/amavis";
$dist["amavis"]["init_script"] = "amavisd";

// ClamAV
$dist["clamav"]["init_script"] = "clamd";

// Pureftpd
$dist["pureftpd"]["config_dir"] = "/etc/pure-ftpd";
$dist["pureftpd"]["init_script"] = "pure-ftpd";

// MyDNS
$dist["mydns"]["config_dir"] = "/etc";
$dist["mydns"]["init_script"] = "mydns";

?>

 install/dist/lib/gentoo.lib.php

New file
@@ -0,0 +1,36 @@
<?php

/*
Copyright (c) 2007, Till Brehm, projektfarm Gmbh
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

    * Redistributions of source code must retain the above copyright notice,
      this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
    * Neither the name of ISPConfig nor the names of its contributors
      may be used to endorse or promote products derived from this software without
      specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

class installer extends installer_base {


}

?>

 install/install.php

@@ -42,12 +42,15 @@
// Include the base class of the installer class
require_once('lib/installer_base.lib.php');

include_once('options.conf.php');
$distname = get_distname();

// Include the distribution specific installer class library
// and configuration
include_once('dist/lib/'.$distname.'.lib.php');
include_once('dist/conf/'.$distname.'.conf.php');
include_once('dist/lib/'.$conf['distname'].'.lib.php');
include_once('dist/conf/'.$conf['distname'].'.conf.php');

$conf['dist'] = $dist;

$inst = new installer();

@@ -72,15 +75,15 @@
// Get MySQL root password
$finished = false;
do {
    $tmp_mysql_server_host = $inst->free_query('MySQL server hostname',$conf["mysql_server_host"]);
    $tmp_mysql_server_admin_user = $inst->free_query('MySQL root username',$conf["mysql_server_admin_user"]);
    $tmp_mysql_server_admin_password = $inst->free_query('MySQL root password',$conf["mysql_server_admin_password"]);
    $tmp_mysql_server_host = $inst->free_query('MySQL server hostname',$conf["mysql"]["host"]);
    $tmp_mysql_server_admin_user = $inst->free_query('MySQL root username',$conf["mysql"]["admin_user"]);
    $tmp_mysql_server_admin_password = $inst->free_query('MySQL root password',$conf["mysql"]["admin_password"]);
    
    // Initialize the MySQL server connection
    if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
        $conf["mysql_server_host"] = $tmp_mysql_server_host;
        $conf["mysql_server_admin_user"] = $tmp_mysql_server_admin_user;
        $conf["mysql_server_admin_password"] = $tmp_mysql_server_admin_password;
        $conf["mysql"]["host"] = $tmp_mysql_server_host;
        $conf["mysql"]["admin_user"] = $tmp_mysql_server_admin_user;
        $conf["mysql"]["admin_password"] = $tmp_mysql_server_admin_password;
        $finished = true;
    } else {
        swriteln($inst->lng("Unable to connect to mysql server").' '.mysql_error());
@@ -147,19 +150,19 @@
    $inst->install_crontab();
    
    swriteln('Restarting services ...');
    system("/etc/init.d/mysql restart");
    system("/etc/init.d/postfix restart");
    system("/etc/init.d/saslauthd restart");
    system("/etc/init.d/amavis restart");
    system("/etc/init.d/clamav-daemon restart");
    system("/etc/init.d/courier-authdaemon restart");
    system("/etc/init.d/courier-imap restart");
    system("/etc/init.d/courier-imap-ssl restart");
    system("/etc/init.d/courier-pop restart");
    system("/etc/init.d/courier-pop-ssl restart");
    system("/etc/init.d/apache2 restart");
    system("/etc/init.d/pure-ftpd-mysql restart");
    system("/etc/init.d/mydns restart");
    system($conf['dist']["init_scripts"].'/'.$conf['dist']['mysql']['init_script'].' restart');
    system($conf['dist']["init_scripts"].'/'.$conf['dist']['postfix']['init_script'].' restart');
    system($conf['dist']["init_scripts"].'/'.$conf['dist']['saslauthd']['init_script'].' restart');
    system($conf['dist']["init_scripts"].'/'.$conf['dist']['amavis']['init_script'].' restart');
    system($conf['dist']["init_scripts"].'/'.$conf['dist']['clamav']['init_script'].' restart');
    system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-authdaemon'].' restart');
    system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-imap'].' restart');
    system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-imap-ssl'].' restart');
    system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-pop'].' restart');
    system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-pop-ssl'].' restart');
    system($conf['dist']["init_scripts"].'/'.$conf['dist']['apache']['init_script'].' restart');
    system($conf['dist']["init_scripts"].'/'.$conf['dist']['pureftpd']['init_script'].' restart');
    system($conf['dist']["init_scripts"].'/'.$conf['dist']['mydns']['init_script'].' restart');
    
} else {
    
@@ -198,29 +201,29 @@
        swriteln('Configuring Getmail');
        $inst->configure_getmail();
        
        system("/etc/init.d/postfix restart");
        system("/etc/init.d/saslauthd restart");
        system("/etc/init.d/amavis restart");
        system("/etc/init.d/clamav-daemon restart");
        system("/etc/init.d/courier-authdaemon restart");
        system("/etc/init.d/courier-imap restart");
        system("/etc/init.d/courier-imap-ssl restart");
        system("/etc/init.d/courier-pop restart");
        system("/etc/init.d/courier-pop-ssl restart");
        system($conf['dist']["init_scripts"].'/'.$conf['dist']['postfix']['init_script'].' restart');
        system($conf['dist']["init_scripts"].'/'.$conf['dist']['saslauthd']['init_script'].' restart');
        system($conf['dist']["init_scripts"].'/'.$conf['dist']['amavis']['init_script'].' restart');
        system($conf['dist']["init_scripts"].'/'.$conf['dist']['clamav']['init_script'].' restart');
        system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-authdaemon'].' restart');
        system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-imap'].' restart');
        system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-imap-ssl'].' restart');
        system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-pop'].' restart');
        system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-pop-ssl'].' restart');
    }
    
    if(strtolower($inst->simple_query('Configure FTP Server',array('y','n'),'y')) == 'y') {
        // Configure Pureftpd
        swriteln('Configuring Pureftpd');
        $inst->configure_pureftpd();
        system("/etc/init.d/pure-ftpd-mysql restart");
        system($conf['dist']["init_scripts"].'/'.$conf['dist']['pureftpd']['init_script'].' restart');
    }
    
    if(strtolower($inst->simple_query('Configure DNS Server',array('y','n'),'y')) == 'y') {
        // Configure MyDNS
        swriteln('Configuring MyDNS');
        $inst->configure_mydns();
        system("/etc/init.d/mydns restart");
        system($conf['dist']["init_scripts"].'/'.$conf['dist']['mydns']['init_script'].' restart');
    }
    
    if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {
@@ -237,8 +240,7 @@
        // Configure ISPConfig
        swriteln('Installing Crontab');
        $inst->install_crontab();
		
        system("/etc/init.d/apache2 restart");
        system($conf['dist']["init_scripts"].'/'.$conf['dist']['apache']['init_script'].' restart');	
    }
    
    
@@ -248,4 +250,4 @@
echo "Installation finished.\n";


?>
?>

 install/lib/install.lib.php

@@ -36,7 +36,7 @@

function get_distname() {
    
    $distname = 'debian40';
    $distname = $conf['distname'];
    
    return $distname;
}
@@ -378,4 +378,4 @@



?>
?>

 install/lib/installer_base.lib.php

@@ -123,30 +123,30 @@
        global $conf;
        
        // Create the database
        if(!$this->db->query("CREATE DATABASE IF NOT EXISTS ".$conf["mysql_server_database"])) {
            $this->error('Unable to create MySQL database: '.$conf["mysql_server_database"].';');
        if(!$this->db->query("CREATE DATABASE IF NOT EXISTS ".$conf["mysql"]["database"])) {
            $this->error('Unable to create MySQL database: '.$conf["mysql"]["database"].';');
        }
        
        // Create the ISPConfig database user
        if(!$this->db->query("GRANT SELECT, INSERT, UPDATE, DELETE ON ".$conf["mysql_server_database"].".* TO '".$conf["mysql_server_ispconfig_user"]."'@'".$conf["mysql_server_host"]."' IDENTIFIED BY '".$conf["mysql_server_ispconfig_password"]."';")) {
            $this->error('Unable to create database user: '.$conf["mysql_server_ispconfig_user"]);
        if(!$this->db->query("GRANT SELECT, INSERT, UPDATE, DELETE ON ".$conf["mysql"]["database"].".* TO '".$conf["mysql"]["ispconfig_user"]."'@'".$conf["mysql"]["host"]."' IDENTIFIED BY '".$conf["mysql"]["ispconfig_password"]."';")) {
            $this->error('Unable to create database user: '.$conf["mysql"]["ispconfig_user"]);
        }
        
        // Reload database priveliges
        $this->db->query('FLUSH PRIVILEGES;');
        
        // Set the database name in the DB library
        $this->db->dbName = $conf["mysql_server_database"];
        $this->db->dbName = $conf["mysql"]["database"];
        
        // loading the database dump into the database, if database is empty
        $db_tables = $this->db->getTables();
        if(count($db_tables) > 0) {
            $this->error('Stopped: Database contains already some tables.');
        } else {
            if($conf["mysql_server_admin_password"] == '') {
                caselog("mysql -h '".$conf["mysql_server_host"]."' -u '".$conf["mysql_server_admin_user"]."' '".$conf["mysql_server_database"]."' < 'sql/ispconfig3.sql' &> /dev/null", $FILE, __LINE__,"read in ispconfig3.sql","could not read in ispconfig3.sql");
            if($conf["mysql"]["admin_password"] == '') {
                caselog("mysql -h '".$conf["mysql"]["host"]."' -u '".$conf["mysql"]["admin_user"]."' '".$conf["mysql"]["database"]."' < 'sql/ispconfig3.sql' &> /dev/null", $FILE, __LINE__,"read in ispconfig3.sql","could not read in ispconfig3.sql");
            } else {
                caselog("mysql -h '".$conf["mysql_server_host"]."' -u '".$conf["mysql_server_admin_user"]."' -p'".$conf["mysql_server_admin_password"]."' '".$conf["mysql_server_database"]."' < 'sql/ispconfig3.sql' &> /dev/null", $FILE, __LINE__,"read in ispconfig3.sql","could not read in ispconfig3.sql");
                caselog("mysql -h '".$conf["mysql"]["host"]."' -u '".$conf["mysql"]["admin_user"]."' -p'".$conf["mysql"]["admin_password"]."' '".$conf["mysql"]["database"]."' < 'sql/ispconfig3.sql' &> /dev/null", $FILE, __LINE__,"read in ispconfig3.sql","could not read in ispconfig3.sql");
            }
            $db_tables = $this->db->getTables();
            if(count($db_tables) == 0) {
@@ -162,105 +162,105 @@
    function configure_postfix($options = '') {
        global $conf;
        
        if(!is_dir($conf["dist_postfix_config_dir"])) $this->error("The postfix configuration directory ".$conf["dist_postfix_config_dir"]." does not exist.");
        if(!is_dir($conf["dist"]["postfix"]["config_dir"])) $this->error("The postfix configuration directory ".$conf["dist"]["postfix"]["config_dir"]." does not exist.");
        
        // mysql-virtual_domains.cf
        $configfile = 'mysql-virtual_domains.cf';
        if(is_file($conf["dist_postfix_config_dir"].'/'.$configfile)) copy($conf["dist_postfix_config_dir"].'/'.$configfile,$conf["dist_postfix_config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist"]["postfix"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$conf["dist"]["postfix"]["config_dir"].'/'.$configfile.'~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql"]["ip"],$content);
        $content = str_replace('{server_id}',$conf["server_id"],$content);
        wf($conf["dist_postfix_config_dir"].'/'.$configfile,$content);
        wf($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$content);
        
        // mysql-virtual_forwardings.cf
        $configfile = 'mysql-virtual_forwardings.cf';
        if(is_file($conf["dist_postfix_config_dir"].'/'.$configfile)) copy($conf["dist_postfix_config_dir"].'/'.$configfile,$conf["dist_postfix_config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist"]["postfix"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$conf["dist"]["postfix"]["config_dir"].'/'.$configfile.'~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql"]["ip"],$content);
        $content = str_replace('{server_id}',$conf["server_id"],$content);
        wf($conf["dist_postfix_config_dir"].'/'.$configfile,$content);
        wf($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$content);
        
        // mysql-virtual_mailboxes.cf
        $configfile = 'mysql-virtual_mailboxes.cf';
        if(is_file($conf["dist_postfix_config_dir"].'/'.$configfile)) copy($conf["dist_postfix_config_dir"].'/'.$configfile,$conf["dist_postfix_config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist"]["postfix"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$conf["dist"]["postfix"]["config_dir"].'/'.$configfile.'~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql"]["ip"],$content);
        $content = str_replace('{server_id}',$conf["server_id"],$content);
        wf($conf["dist_postfix_config_dir"].'/'.$configfile,$content);
        wf($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$content);
        
        // mysql-virtual_email2email.cf
        $configfile = 'mysql-virtual_email2email.cf';
        if(is_file($conf["dist_postfix_config_dir"].'/'.$configfile)) copy($conf["dist_postfix_config_dir"].'/'.$configfile,$conf["dist_postfix_config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist"]["postfix"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$conf["dist"]["postfix"]["config_dir"].'/'.$configfile.'~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql"]["ip"],$content);
        $content = str_replace('{server_id}',$conf["server_id"],$content);
        wf($conf["dist_postfix_config_dir"].'/'.$configfile,$content);
        wf($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$content);
        
        // mysql-virtual_transports.cf
        $configfile = 'mysql-virtual_transports.cf';
        if(is_file($conf["dist_postfix_config_dir"].'/'.$configfile)) copy($conf["dist_postfix_config_dir"].'/'.$configfile,$conf["dist_postfix_config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist"]["postfix"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$conf["dist"]["postfix"]["config_dir"].'/'.$configfile.'~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql"]["ip"],$content);
        $content = str_replace('{server_id}',$conf["server_id"],$content);
        wf($conf["dist_postfix_config_dir"].'/'.$configfile,$content);
        wf($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$content);
        
        // mysql-virtual_recipient.cf
        $configfile = 'mysql-virtual_recipient.cf';
        if(is_file($conf["dist_postfix_config_dir"].'/'.$configfile)) copy($conf["dist_postfix_config_dir"].'/'.$configfile,$conf["dist_postfix_config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist"]["postfix"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$conf["dist"]["postfix"]["config_dir"].'/'.$configfile.'~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql"]["ip"],$content);
        $content = str_replace('{server_id}',$conf["server_id"],$content);
        wf($conf["dist_postfix_config_dir"].'/'.$configfile,$content);
        wf($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$content);
        
        // mysql-virtual_sender.cf
        $configfile = 'mysql-virtual_sender.cf';
        if(is_file($conf["dist_postfix_config_dir"].'/'.$configfile)) copy($conf["dist_postfix_config_dir"].'/'.$configfile,$conf["dist_postfix_config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist"]["postfix"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$conf["dist"]["postfix"]["config_dir"].'/'.$configfile.'~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql"]["ip"],$content);
        $content = str_replace('{server_id}',$conf["server_id"],$content);
        wf($conf["dist_postfix_config_dir"].'/'.$configfile,$content);
        wf($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$content);
        
        // mysql-virtual_client.cf
        $configfile = 'mysql-virtual_client.cf';
        if(is_file($conf["dist_postfix_config_dir"].'/'.$configfile)) copy($conf["dist_postfix_config_dir"].'/'.$configfile,$conf["dist_postfix_config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist"]["postfix"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$conf["dist"]["postfix"]["config_dir"].'/'.$configfile.'~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql"]["ip"],$content);
        $content = str_replace('{server_id}',$conf["server_id"],$content);
        wf($conf["dist_postfix_config_dir"].'/'.$configfile,$content);
        wf($conf["dist"]["postfix"]["config_dir"].'/'.$configfile,$content);
        
        // Changing mode and group of the new created config files.
        caselog("chmod o= ".$conf["dist_postfix_config_dir"]."/mysql-virtual_*.cf* &> /dev/null", __FILE__, __LINE__,"chmod on mysql-virtual_*.cf*","chmod on mysql-virtual_*.cf* failed");
        caselog("chgrp ".$conf["dist_postfix_groupname"]." ".$conf["dist_postfix_config_dir"]."/mysql-virtual_*.cf* &> /dev/null", __FILE__, __LINE__,"chgrp on mysql-virtual_*.cf*","chgrp on mysql-virtual_*.cf* failed");
        caselog("chmod o= ".$conf["dist"]["postfix"]["config_dir"]."/mysql-virtual_*.cf* &> /dev/null", __FILE__, __LINE__,"chmod on mysql-virtual_*.cf*","chmod on mysql-virtual_*.cf* failed");
        caselog("chgrp ".$conf["dist"]["postfix"]["groupname"]." ".$conf["dist"]["postfix"]["config_dir"]."/mysql-virtual_*.cf* &> /dev/null", __FILE__, __LINE__,"chgrp on mysql-virtual_*.cf*","chgrp on mysql-virtual_*.cf* failed");
        
        // Creating virtual mail user and group
        $command = "groupadd -g ".$conf["dist_postfix_vmail_groupid"]." ".$conf["dist_postfix_vmail_groupname"];
        $command = "groupadd -g ".$conf["dist"]["postfix"]["vmail_groupid"]." ".$conf["dist"]["postfix"]["vmail_groupname"];
        caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
        
        $command = "useradd -g ".$conf["dist_postfix_vmail_groupname"]." -u ".$conf["dist_postfix_vmail_userid"]." ".$conf["dist_postfix_vmail_username"]." -d ".$conf["dist_postfix_vmail_mailbox_base"]." -m";
        $command = "useradd -g ".$conf["dist"]["postfix"]["vmail_groupname"]." -u ".$conf["dist"]["postfix"]["vmail_userid"]." ".$conf["dist"]["postfix"]["vmail_username"]." -d ".$conf["dist"]["postfix"]["vmail_mailbox_base"]." -m";
        caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);        

        $postconf_commands = array (
@@ -268,46 +268,46 @@
            'mydestination = '.$conf["hostname"].', localhost, localhost.localdomain',
            'mynetworks = 127.0.0.0/8',
            'virtual_alias_domains =',
            'virtual_alias_maps = proxy:mysql:'.$conf["dist_postfix_config_dir"].'/mysql-virtual_forwardings.cf, mysql:'.$conf["dist_postfix_config_dir"].'/mysql-virtual_email2email.cf',
            'virtual_mailbox_domains = proxy:mysql:'.$conf["dist_postfix_config_dir"].'/mysql-virtual_domains.cf',
            'virtual_mailbox_maps = proxy:mysql:'.$conf["dist_postfix_config_dir"].'/mysql-virtual_mailboxes.cf',
            'virtual_mailbox_base = '.$conf["dist_postfix_vmail_mailbox_base"],
            'virtual_uid_maps = static:'.$conf["dist_postfix_vmail_userid"],
            'virtual_gid_maps = static:'.$conf["dist_postfix_vmail_groupid"],
            'virtual_alias_maps = proxy:mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_forwardings.cf, mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_email2email.cf',
            'virtual_mailbox_domains = proxy:mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_domains.cf',
            'virtual_mailbox_maps = proxy:mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_mailboxes.cf',
            'virtual_mailbox_base = '.$conf["dist"]["postfix"]["vmail_mailbox_base"],
            'virtual_uid_maps = static:'.$conf["dist"]["postfix"]["vmail_userid"],
            'virtual_gid_maps = static:'.$conf["dist"]["postfix"]["vmail_groupid"],
            'smtpd_sasl_auth_enable = yes',
            'broken_sasl_auth_clients = yes',
            'smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:'.$conf["dist_postfix_config_dir"].'/mysql-virtual_recipient.cf, reject_unauth_destination',
            'smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_recipient.cf, reject_unauth_destination',
            'smtpd_use_tls = yes',
            'smtpd_tls_cert_file = '.$conf["dist_postfix_config_dir"].'/smtpd.cert',
            'smtpd_tls_key_file = '.$conf["dist_postfix_config_dir"].'/smtpd.key',
            'transport_maps = proxy:mysql:'.$conf["dist_postfix_config_dir"].'/mysql-virtual_transports.cf',
            'smtpd_tls_cert_file = '.$conf["dist"]["postfix"]["config_dir"].'/smtpd.cert',
            'smtpd_tls_key_file = '.$conf["dist"]["postfix"]["config_dir"].'/smtpd.key',
            'transport_maps = proxy:mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_transports.cf',
            'virtual_create_maildirsize = yes',
            'virtual_mailbox_extended = yes',
            'virtual_mailbox_limit_maps = proxy:mysql:'.$conf["dist_postfix_config_dir"].'/mysql-virtual_mailbox_limit_maps.cf',
            'virtual_mailbox_limit_maps = proxy:mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_mailbox_limit_maps.cf',
            'virtual_mailbox_limit_override = yes',
            'virtual_maildir_limit_message = "The user you are trying to reach is over quota."',
            'virtual_overquota_bounce = yes',
            'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps',
            'smtpd_sender_restrictions = check_sender_access mysql:'.$conf["dist_postfix_config_dir"].'/mysql-virtual_sender.cf',
            'smtpd_client_restrictions = check_client_access mysql:'.$conf["dist_postfix_config_dir"].'/mysql-virtual_client.cf',
            'smtpd_sender_restrictions = check_sender_access mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_sender.cf',
            'smtpd_client_restrictions = check_client_access mysql:'.$conf["dist"]["postfix"]["config_dir"].'/mysql-virtual_client.cf',
            'maildrop_destination_concurrency_limit = 1',
            'maildrop_destination_recipient_limit   = 1',
            'virtual_transport = maildrop',
            'header_checks = regexp:/etc/postfix/header_checks',
            'mime_header_checks = regexp:/etc/postfix/mime_header_checks',
            'nested_header_checks = regexp:/etc/postfix/nested_header_checks',
            'body_checks = regexp:/etc/postfix/body_checks'
            'header_checks = regexp:'.$conf["dist"]["postfix"]["config_dir"].'/header_checks',
            'mime_header_checks = regexp:'.$conf["dist"]["postfix"]["config_dir"].'/mime_header_checks',
            'nested_header_checks = regexp:'.$conf["dist"]["postfix"]["config_dir"].'/nested_header_checks',
            'body_checks = regexp:'.$conf["dist"]["postfix"]["config_dir"].'/body_checks'
        );
        
        // Create the header ynd body check files
        touch('/etc/postfix/header_checks');
        touch('/etc/postfix/mime_header_checks');
        touch('/etc/postfix/nested_header_checks');
        touch('/etc/postfix/body_checks');
        touch($conf["dist"]["postfix"]["config_dir"].'/header_checks');
        touch($conf["dist"]["postfix"]["config_dir"].'/mime_header_checks');
        touch($conf["dist"]["postfix"]["config_dir"].'/nested_header_checks');
        touch($conf["dist"]["postfix"]["config_dir"].'/body_checks');
        
        
        // Make a backup copy of the main.cf file
        copy($conf["dist_postfix_config_dir"].'/main.cf',$conf["dist_postfix_config_dir"].'/main.cf~');
        copy($conf["dist"]["postfix"]["config_dir"].'/main.cf',$conf["dist"]["postfix"]["config_dir"].'/main.cf~');
        
        // Executing the postconf commands
        foreach($postconf_commands as $cmd) {
@@ -324,10 +324,10 @@
        */
        if(!stristr($options,'dont-create-certs')) {
            // Create the SSL certificate
            $command = "cd ".$conf["dist_postfix_config_dir"]."; openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509";
            $command = "cd ".$conf["dist"]["postfix"]["config_dir"]."; openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509";
            exec($command);
        
            $command = "chmod o= ".$conf["dist_postfix_config_dir"]."/smtpd.key";
            $command = "chmod o= ".$conf["dist"]["postfix"]["config_dir"]."/smtpd.key";
            caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
        }
        
@@ -340,29 +340,29 @@
        caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
        
        // Changing maildrop lines in posfix master.cf
        if(is_file($conf["dist_postfix_config_dir"].'/master.cf')) copy($conf["dist_postfix_config_dir"].'/master.cf',$conf["dist_postfix_config_dir"].'/master.cf~');
        if(is_file($conf["dist_postfix_config_dir"].'/master.cf~')) exec('chmod 400 '.$conf["dist_postfix_config_dir"].'/master.cf~');
        $configfile = $conf["dist_postfix_config_dir"].'/master.cf';
        if(is_file($conf["dist"]["postfix"]["config_dir"].'/master.cf')) copy($conf["dist"]["postfix"]["config_dir"].'/master.cf',$conf["dist"]["postfix"]["config_dir"].'/master.cf~');
        if(is_file($conf["dist"]["postfix"]["config_dir"].'/master.cf~')) exec('chmod 400 '.$conf["dist"]["postfix"]["config_dir"].'/master.cf~');
        $configfile = $conf["dist"]["postfix"]["config_dir"].'/master.cf';
        $content = rf($configfile);
        $content = str_replace('  flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}','  flags=R user='.$conf["dist_postfix_vmail_username"].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}',$content);
        $content = str_replace('  flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}','  flags=R user='.$conf["dist"]["postfix"]["vmail_username"].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}',$content);
        wf($configfile,$content);
        
        // Writing the Maildrop mailfilter file
        $configfile = 'mailfilter';
        if(is_file($conf["dist_postfix_vmail_mailbox_base"].'/.'.$configfile)) copy($conf["dist_postfix_vmail_mailbox_base"].'/.'.$configfile,$conf["dist_postfix_vmail_mailbox_base"].'/.'.$configfile.'~');
        if(is_file($conf["dist"]["postfix"]["vmail_mailbox_base"].'/.'.$configfile)) copy($conf["dist"]["postfix"]["vmail_mailbox_base"].'/.'.$configfile,$conf["dist"]["postfix"]["vmail_mailbox_base"].'/.'.$configfile.'~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{dist_postfix_vmail_mailbox_base}',$conf["dist_postfix_vmail_mailbox_base"],$content);
        wf($conf["dist_postfix_vmail_mailbox_base"].'/.'.$configfile,$content);
        $content = str_replace('{dist_postfix_vmail_mailbox_base}',$conf["dist"]["postfix"]["vmail_mailbox_base"],$content);
        wf($conf["dist"]["postfix"]["vmail_mailbox_base"].'/.'.$configfile,$content);
        
        // Create the directory for the custom mailfilters
        $command = "mkdir ".$conf["dist_postfix_vmail_mailbox_base"]."/mailfilters";
        $command = "mkdir ".$conf["dist"]["postfix"]["vmail_mailbox_base"]."/mailfilters";
        caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
        
        // Chmod and chown the .mailfilter file
        $command = "chown -R ".$conf["dist_postfix_vmail_username"].":".$conf["dist_postfix_vmail_groupname"]." ".$conf["dist_postfix_vmail_mailbox_base"]."/.mailfilter";
        $command = "chown -R ".$conf["dist"]["postfix"]["vmail_username"].":".$conf["dist"]["postfix"]["vmail_groupname"]." ".$conf["dist"]["postfix"]["vmail_mailbox_base"]."/.mailfilter";
        caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
        
        $command = "chmod -R 600 ".$conf["dist_postfix_vmail_mailbox_base"]."/.mailfilter";
        $command = "chmod -R 600 ".$conf["dist"]["postfix"]["vmail_mailbox_base"]."/.mailfilter";
        caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
        
        
@@ -374,24 +374,24 @@
        
    
        $configfile = 'sasl_smtpd.conf';
        if(is_file($conf["dist_postfix_config_dir"].'/sasl/smtpd.conf')) copy($conf["dist_postfix_config_dir"].'/sasl/smtpd.conf',$conf["dist_postfix_config_dir"].'/sasl/smtpd.conf~');
        if(is_file($conf["dist_postfix_config_dir"].'/sasl/smtpd.conf~')) exec('chmod 400 '.$conf["dist_postfix_config_dir"].'/sasl/smtpd.conf~');
        if(is_file($conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf')) copy($conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf',$conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf~');
        if(is_file($conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf~')) exec('chmod 400 '.$conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content);
        wf($conf["dist_postfix_config_dir"].'/sasl/smtpd.conf',$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql"]["ip"],$content);
        wf($conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf',$content);
        
        // TODO: Chmod and chown on the config file
        
        
        
        // Create the spool directory
        exec("mkdir -p /var/spool/postfix/var/run/saslauthd");
        exec('mkdir -p /var/spool/postfix/var/run/saslauthd');
        
        // Edit the file /etc/default/saslauthd
        $configfile = '/etc/default/saslauthd';
        $configfile = $conf['dist']["saslauthd"]["config"];
        if(is_file($configfile)) copy($configfile,$configfile.'~');
        if(is_file($configfile.'~')) exec('chmod 400 '.$configfile.'~');
        $content = rf($configfile);
@@ -399,8 +399,8 @@
        $content = str_replace('OPTIONS="-c"','OPTIONS="-m /var/spool/postfix/var/run/saslauthd -r"',$content);
        wf($configfile,$content);
        
        // Edit the file /etc/default/saslauthd
        $configfile = '/etc/init.d/saslauthd';
        // Edit the file /etc/init.d/saslauthd
        $configfile = $conf["dist"]["init_scripts"].'/'.$conf["dist"]["saslauthd"]["init_script"];
        $content = rf($configfile);
        $content = str_replace('PIDFILE=$RUN_DIR/saslauthd.pid','PIDFILE="/var/spool/postfix/var/run/${NAME}/saslauthd.pid"',$content);
        wf($configfile,$content);
@@ -413,16 +413,16 @@
        
        // configure pam for SMTP authentication agains the ispconfig database
        $configfile = 'pamd_smtp';
        if(is_file('/etc/pam.d/smtp')) copy('/etc/pam.d/smtp','/etc/pam.d/smtp~');
        if(is_file('/etc/pam.d/smtp~')) exec('chmod 400 /etc/pam.d/smtp~');
        if(is_file($conf['dist']['pam'].'/smtp')) copy($conf['dist']['pam'].'/smtp',$conf['dist']['pam'].'/smtp~');
        if(is_file($conf['dist']['pam'].'/smtp~')) exec('chmod 400 '.$conf['dist']['pam'].'/smtp~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content);
        wf('/etc/pam.d/smtp',$content);
        exec('chmod 660 /etc/pam.d/smtp');
        exec('chown daemon:daemon /etc/pam.d/smtp');
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql"]["ip"],$content);
        wf($conf['dist']['pam'].'/smtp',$content);
        exec('chmod 660 '.$conf['dist']['pam'].'/smtp');
        exec('chown daemon:daemon '.$conf['dist']['pam'].'/smtp');
    
    }
    
@@ -431,20 +431,20 @@
        
        // authmysqlrc
        $configfile = 'authmysqlrc';
        if(is_file($conf["dist_courier_config_dir"].'/'.$configfile)) copy($conf["dist_courier_config_dir"].'/'.$configfile,$conf["dist_courier_config_dir"].'/'.$configfile.'~');
        exec('chmod 400 '.$conf["dist_courier_config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist"]["courier"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["courier"]["config_dir"].'/'.$configfile,$conf["dist"]["courier"]["config_dir"].'/'.$configfile.'~');
        exec('chmod 400 '.$conf["dist"]["courier"]["config_dir"].'/'.$configfile.'~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_host}',$conf["mysql_server_host"],$content);
        wf($conf["dist_courier_config_dir"].'/'.$configfile,$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_host}',$conf["mysql"]["host"],$content);
        wf($conf["dist"]["courier"]["config_dir"].'/'.$configfile,$content);
        
        exec('chmod 660 '.$conf["dist_courier_config_dir"].'/'.$configfile);
        exec('chown daemon:daemon '.$conf["dist_courier_config_dir"].'/'.$configfile);
        exec('chmod 660 '.$conf["dist"]["courier"]["config_dir"].'/'.$configfile);
        exec('chown daemon:daemon '.$conf["dist"]["courier"]["config_dir"].'/'.$configfile);
        
        //authdaemonrc
        $configfile = $conf["dist_courier_config_dir"].'/authdaemonrc';
        $configfile = $conf["dist"]["courier"]["config_dir"].'/authdaemonrc';
        if(is_file($configfile)) copy($configfile,$configfile.'~');
        if(is_file($configfile.'~')) exec('chmod 400 '.$configfile.'~');
        $content = rf($configfile);
@@ -459,15 +459,15 @@
        
        // amavisd user config file
        $configfile = 'amavisd_user_config';
        if(is_file($conf["dist_amavis_config_dir"].'/conf.d/50-user')) copy($conf["dist_amavis_config_dir"].'/conf.d/50-user',$conf["dist_courier_config_dir"].'/50-user~');
        if(is_file($conf["dist_amavis_config_dir"].'/conf.d/50-user~')) exec('chmod 400 '.$conf["dist_amavis_config_dir"].'/conf.d/50-user~');
        if(is_file($conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user')) copy($conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user',$conf["dist"]["courier"]["config_dir"].'/50-user~');
        if(is_file($conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user~')) exec('chmod 400 '.$conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_port}',$conf["mysql_server_port"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content);
        wf($conf["dist_amavis_config_dir"].'/conf.d/50-user',$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_port}',$conf["mysql"]["port"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql"]["ip"],$content);
        wf($conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user',$content);
        
        // TODO: chmod and chown on the config file
        
@@ -479,7 +479,7 @@
        );
        
        // Make a backup copy of the main.cf file
        copy($conf["dist_postfix_config_dir"].'/main.cf',$conf["dist_postfix_config_dir"].'/main.cf~2');
        copy($conf["dist"]["postfix"]["config_dir"].'/main.cf',$conf["dist"]["postfix"]["config_dir"].'/main.cf~2');
        
        // Executing the postconf commands
        foreach($postconf_commands as $cmd) {
@@ -488,11 +488,11 @@
        }
        
        // Append the configuration for amavisd to the master.cf file
        if(is_file($conf["dist_postfix_config_dir"].'/master.cf')) copy($conf["dist_postfix_config_dir"].'/master.cf',$conf["dist_postfix_config_dir"].'/master.cf~');
        if(is_file($conf["dist"]["postfix"]["config_dir"].'/master.cf')) copy($conf["dist"]["postfix"]["config_dir"].'/master.cf',$conf["dist"]["postfix"]["config_dir"].'/master.cf~');
        $content = rf("tpl/master_cf_amavis.master");
        // Only add the content if we had not addded it before
        if(!stristr("127.0.0.1:10025 inet n - - - - smtpd",$content)) {
            af($conf["dist_postfix_config_dir"].'/master.cf',$content);
            af($conf["dist"]["postfix"]["config_dir"].'/master.cf',$content);
        }
        
        // Add the clamav user to the amavis group
@@ -515,13 +515,13 @@
    function configure_getmail() {
        global $conf;
        
        $command = "useradd -d /etc/getmail getmail";
        $command = 'useradd -d '.$conf["dist"]["getmail"]["config_dir"].' getmail';
        caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
        
        $command = "chown -R getmail /etc/getmail";
        $command = 'chown -R getmail '.$conf["dist"]["getmail"]["config_dir"];
        caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
        
        $command = "chmod -R 700 /etc/getmail";
        $command = 'chmod -R 700 '.$conf["dist"]["getmail"]["config_dir"];
        caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
    }
    
@@ -530,20 +530,21 @@
        global $conf;
        
        // configure pam for SMTP authentication agains the ispconfig database
        $configfile = 'mysql.conf';
        if(is_file($conf["dist_pureftpd_config_dir"].'/'.$configfile)) copy($conf["dist_pureftpd_config_dir"].'/'.$configfile,$conf["dist_pureftpd_config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist_pureftpd_config_dir"].'/'.$configfile.'~')) exec('chmod 400 '.$conf["dist_pureftpd_config_dir"].'/'.$configfile.'~');
        $content = rf("tpl/pureftpd_".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content);
        $configfile = 'db/mysql.conf';
        if(is_file($conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile,$conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile.'~')) exec('chmod 400 '.$conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile.'~');
        $content = rf("tpl/pureftpd_mysql.conf.master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_ip}',$conf["mysql"]["ip"],$content);
        $content = str_replace('{server_id}',$conf["server_id"],$content);
        wf($conf["dist_pureftpd_config_dir"].'/'.$configfile,$content);
        exec('chmod 600 '.$conf["dist_pureftpd_config_dir"].'/'.$configfile);
        exec('chown root:root '.$conf["dist_pureftpd_config_dir"].'/'.$configfile);
        wf($conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile,$content);
        exec('chmod 600 '.$conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile);
        exec('chown root:root '.$conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile);
        // enable chrooting
        exec('echo "yes" > /etc/pure-ftpd/conf/ChrootEveryone');
        exec('mkdir -p '.$conf["dist"]["pureftpd"]["config_dir"].'/conf/ChrootEveryone');
        exec('echo "yes" > '.$conf["dist"]["pureftpd"]["config_dir"].'/conf/ChrootEveryone');
    
    }
    
@@ -552,17 +553,17 @@
        
        // configure pam for SMTP authentication agains the ispconfig database
        $configfile = 'mydns.conf';
        if(is_file($conf["dist_mydns_config_dir"].'/'.$configfile)) copy($conf["dist_mydns_config_dir"].'/'.$configfile,$conf["dist_mydns_config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist_mydns_config_dir"].'/'.$configfile.'~')) exec('chmod 400 '.$conf["dist_mydns_config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist"]["mydns"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["mydns"]["config_dir"].'/'.$configfile,$conf["dist"]["mydns"]["config_dir"].'/'.$configfile.'~');
        if(is_file($conf["dist"]["mydns"]["config_dir"].'/'.$configfile.'~')) exec('chmod 400 '.$conf["dist"]["mydns"]["config_dir"].'/'.$configfile.'~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_host}',$conf["mysql_server_host"],$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_host}',$conf["mysql"]["host"],$content);
        $content = str_replace('{server_id}',$conf["server_id"],$content);
        wf($conf["dist_mydns_config_dir"].'/'.$configfile,$content);
        exec('chmod 600 '.$conf["dist_mydns_config_dir"].'/'.$configfile);
        exec('chown root:root '.$conf["dist_mydns_config_dir"].'/'.$configfile);
        wf($conf["dist"]["mydns"]["config_dir"].'/'.$configfile,$content);
        exec('chmod 600 '.$conf["dist"]["mydns"]["config_dir"].'/'.$configfile);
        exec('chown root:root '.$conf["dist"]["mydns"]["config_dir"].'/'.$configfile);
    
    }
    
@@ -605,20 +606,20 @@
        $configfile = 'config.inc.php';
        if(is_file($conf["ispconfig_install_dir"].'/interface/lib/'.$configfile)) copy($conf["ispconfig_install_dir"].'/interface/lib/'.$configfile,$conf["ispconfig_install_dir"].'/interface/lib/'.$configfile.'~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_host}',$conf["mysql_server_host"],$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_host}',$conf["mysql"]["host"],$content);
        wf($conf["ispconfig_install_dir"].'/interface/lib/'.$configfile,$content);
        
        // Create the config file for ISPConfig server
        $configfile = 'config.inc.php';
        if(is_file($conf["ispconfig_install_dir"].'/server/lib/'.$configfile)) copy($conf["ispconfig_install_dir"].'/server/lib/'.$configfile,$conf["ispconfig_install_dir"].'/interface/lib/'.$configfile.'~');
        $content = rf("tpl/".$configfile.".master");
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
        $content = str_replace('{mysql_server_host}',$conf["mysql_server_host"],$content);
        $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql"]["ispconfig_user"],$content);
        $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql"]["ispconfig_password"],$content);
        $content = str_replace('{mysql_server_database}',$conf["mysql"]["database"],$content);
        $content = str_replace('{mysql_server_host}',$conf["mysql"]["host"],$content);
        $content = str_replace('{server_id}',$conf["server_id"],$content);
        wf($conf["ispconfig_install_dir"].'/server/lib/'.$configfile,$content);
        
@@ -647,10 +648,10 @@
        caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
        
        // Copy the ISPConfig vhost for the controlpanel
        copy('tpl/apache_ispconfig.vhost.master',$conf["dist_apache_vhost_conf_dir"].'/ispconfig.vhost');
        copy('tpl/apache_ispconfig.vhost.master',$conf["dist"]["apache"]["vhost_conf_dir"].'/ispconfig.vhost');
        // and create the symlink
        if(!is_link($conf["dist_apache_vhost_conf_enabled_dir"].'/ispconfig.vhost')) {
            exec('ln -s '.$conf["dist_apache_vhost_conf_dir"].'/ispconfig.vhost '.$conf["dist_apache_vhost_conf_enabled_dir"].'/ispconfig.vhost');
        if(!is_link($conf["dist"]["apache"]["vhost_conf_enabled_dir"].'/ispconfig.vhost')) {
            exec('ln -s '.$conf["dist"]["apache"]["vhost_conf_dir"].'/ispconfig.vhost '.$conf["dist"]["apache"]["vhost_conf_enabled_dir"].'/ispconfig.vhost');
        }
        
    }
@@ -676,7 +677,7 @@
        exec("crontab -u getmail -l > crontab.txt");
        $existing_cron_jobs = file('crontab.txt');
        
        $cron_jobs = array('*/5 * * * * '.$conf["dist_getmail_program"].' -g '.$conf["dist_getmail_config_dir"].' -r '.$conf["dist_getmail_config_dir"].'/*.conf &> /dev/null');
        $cron_jobs = array('*/5 * * * * '.$conf["dist"]["getmail"]["program"].' -g '.$conf["dist"]["getmail"]["config_dir"].' -r '.$conf["dist"]["getmail"]["config_dir"].'/*.conf &> /dev/null');
        foreach($cron_jobs as $cron_job) {
            if(!in_array($cron_job."\n",$existing_cron_jobs)) {
                $existing_cron_jobs[] = $cron_job."\n";
@@ -692,4 +693,4 @@
    
}

?>
?>

 install/lib/mysql.lib.php

@@ -48,10 +48,10 @@
        {
            
            global $conf;
            $this->dbHost = $conf["mysql_server_host"];
            //$this->dbName = $conf["mysql_server_database"];
            $this->dbUser = $conf["mysql_server_admin_user"];
            $this->dbPass = $conf["mysql_server_admin_password"];
            $this->dbHost = $conf["mysql"]["host"];
            //$this->dbName = $conf["mysql"]["database"];
            $this->dbUser = $conf["mysql"]["admin_user"];
            $this->dbPass = $conf["mysql"]["admin_password"];
            //$this->connect();
        }

@@ -496,4 +496,4 @@
        
    }

?>
?>

 install/options.conf.php

New file
@@ -0,0 +1,26 @@
<?php

/*
    Installation Options
*/

$conf["language"] = "en";
$conf["distname"] = "debian40";
$conf["hostname"] = "server1.example.com"; // Full hostname
$conf["ispconfig_install_dir"] = "/usr/local/ispconfig";
$conf["ispconfig_config_dir"] = "/usr/local/ispconfig";
$conf["server_id"] = 1;

/*
    MySQL Database settings
*/
$conf["mysql"]["host"] = "localhost";
$conf["mysql"]["ip"] = "127.0.0.1";
$conf["mysql"]["port"] = "3306";
$conf["mysql"]["database"] = "dbispconfig";
$conf["mysql"]["admin_user"] = "root";
$conf["mysql"]["admin_password"] = "";
$conf["mysql"]["ispconfig_user"] = "ispconfig";
$conf["mysql"]["ispconfig_password"] = "5sDrewBhk";

?>

 install/tpl/apache_ispconfig.vhost.master

@@ -18,6 +18,8 @@
    <Directory /usr/local/ispconfig/interface/web/>
        Options FollowSymLinks
        AllowOverride None
        Order allow,deny
        Allow from all
    </Directory>
    
    ErrorLog /var/log/apache2/error.log

 install/update.php

@@ -38,6 +38,8 @@
// Include the base class of the installer class
require_once('lib/installer_base.lib.php');

include_once("options.conf.php");
$conf['dist'] = $dist;
$distname = get_distname();

include_once("/usr/local/ispconfig/server/lib/config.inc.php");
@@ -50,10 +52,10 @@
include_once('dist/conf/'.$distname.'.conf.php');

// Set the mysql login information
$conf["mysql_server_host"] = $conf_old["db_host"];
$conf["mysql_server_database"] = $conf_old["db_database"];
$conf["mysql_server_ispconfig_user"] = $conf_old["db_user"];
$conf["mysql_server_ispconfig_password"] = $conf_old["db_password"];
$conf["mysql"]["host"] = $conf_old["db_host"];
$conf["mysql"]["database"] = $conf_old["db_database"];
$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];

$inst = new installer();

@@ -71,7 +73,7 @@
// Database update is a bit brute force and should be rebuild later ;)

// export the current database data
if($conf["mysql_server_admin_password"] != '') {
if($conf["mysql"]["admin_password"] != '') {
    system("mysqldump -h $conf[mysql_server_host] -u $conf[mysql_server_admin_user] -p$conf[mysql_server_admin_password] -c -t --add-drop-table --all --quick $conf[mysql_server_database] > existing_db.sql");
} else {
    system("mysqldump -h $conf[mysql_server_host] -u $conf[mysql_server_admin_user] -c -t --add-drop-table --all --quick $conf[mysql_server_database] > existing_db.sql");
@@ -81,7 +83,7 @@
// Delete the old database
exec("/etc/init.d/mysql stop");
sleep(3);
if($conf["mysql_server_database"] != '') exec("rm -rf /var/lib/mysql/".$conf["mysql_server_database"]);
if($conf["mysql"]["database"] != '') exec("rm -rf /var/lib/mysql/".$conf["mysql"]["database"]);
exec("/etc/init.d/mysql start");
sleep(5);

@@ -95,7 +97,7 @@
}

// load old data back into database
if($conf["mysql_server_admin_password"] != '') {
if($conf["mysql"]["admin_password"] != '') {
    system("mysql -h $conf[mysql_server_host] -u $conf[mysql_server_admin_user] -p$conf[mysql_server_admin_password] $conf[mysql_server_database] < existing_db.sql");
} else {
    system("mysql -h $conf[mysql_server_host] -u $conf[mysql_server_admin_user] $conf[mysql_server_database] < existing_db.sql");
@@ -171,4 +173,4 @@
echo "Update finished.\n";


?>
?>