diff --git a/install/dist/conf/debian40.conf.php b/install/dist/conf/debian40.conf.php index f7acba63813ab2b7dec85953493f3e79bc4e96d6..ac6742d01b7a2e4efb7f04a620842d5d871baa7c 100644 --- a/install/dist/conf/debian40.conf.php +++ b/install/dist/conf/debian40.conf.php @@ -1,72 +1,67 @@ \ No newline at end of file +?> diff --git a/install/dist/conf/gentoo.conf.php b/install/dist/conf/gentoo.conf.php new file mode 100644 index 0000000000000000000000000000000000000000..90663cd14b134715f6e79fad78177d9b7abf253d --- /dev/null +++ b/install/dist/conf/gentoo.conf.php @@ -0,0 +1,67 @@ + diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php new file mode 100644 index 0000000000000000000000000000000000000000..cf8e864e6b00227b6730ef61a6c7aea8595dfe8f --- /dev/null +++ b/install/dist/lib/gentoo.lib.php @@ -0,0 +1,36 @@ + \ No newline at end of file diff --git a/install/install.php b/install/install.php index 8022b0dbe225ebc5885409c7192f6579a70a498f..8f4bf5c0c4107476af18392f522d8c30a501dd0d 100644 --- a/install/install.php +++ b/install/install.php @@ -42,12 +42,15 @@ require_once('lib/install.lib.php'); // 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 @@ unset($tmp_out); // 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 @@ if($install_mode == 'Standard') { $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 @@ if($install_mode == 'Standard') { 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 @@ if($install_mode == 'Standard') { // 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 @@ if($install_mode == 'Standard') { echo "Installation finished.\n"; -?> \ No newline at end of file +?> diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index 513f09eb8842de22d56a54a3404f21b5c1af61db..48766d7368d32fc7b944ced18080f2338f51c68a 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -36,7 +36,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. function get_distname() { - $distname = 'debian40'; + $distname = $conf['distname']; return $distname; } @@ -378,4 +378,4 @@ echo "Argument $i : $argv[$i] \n"; -?> \ No newline at end of file +?> diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index beb9fdb59785a7a6a44290f655ddd97831ad9606..637047a65f9f3f6c474603f85549281e1a5c8ad9 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -123,30 +123,30 @@ class installer_base { 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 @@ class installer_base { 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 @@ class installer_base { '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 @@ maildrop unix - n n - - pipe */ 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 @@ maildrop unix - n n - - pipe 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 @@ maildrop unix - n n - - pipe $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 @@ maildrop unix - n n - - pipe $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 @@ maildrop unix - n n - - pipe // 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 @@ maildrop unix - n n - - pipe // 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 @@ maildrop unix - n n - - pipe // 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 @@ maildrop unix - n n - - pipe ); // 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 @@ maildrop unix - n n - - pipe } // 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 @@ maildrop unix - n n - - pipe 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 @@ maildrop unix - n n - - pipe 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 @@ maildrop unix - n n - - pipe // 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 @@ maildrop unix - n n - - pipe $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 @@ maildrop unix - n n - - pipe 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 @@ maildrop unix - n n - - pipe 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 @@ maildrop unix - n n - - pipe } -?> \ No newline at end of file +?> diff --git a/install/lib/mysql.lib.php b/install/lib/mysql.lib.php index dd85628ef02839b75c51bf1e2c1c06189751603c..28faa6b4fc6575547937611bf4db275cf2563699 100644 --- a/install/lib/mysql.lib.php +++ b/install/lib/mysql.lib.php @@ -48,10 +48,10 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. { 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 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. } -?> \ No newline at end of file +?> diff --git a/install/options.conf.php b/install/options.conf.php new file mode 100644 index 0000000000000000000000000000000000000000..269c9e68dca549d9775400386c893fc41ac40377 --- /dev/null +++ b/install/options.conf.php @@ -0,0 +1,26 @@ + diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master index 5b62c5be7fbe6bcf508390a2355720f3476ed096..040d5eee4e6f998291d27bf95d8325f46523c949 100644 --- a/install/tpl/apache_ispconfig.vhost.master +++ b/install/tpl/apache_ispconfig.vhost.master @@ -18,6 +18,8 @@ NameVirtualHost *:8080 Options FollowSymLinks AllowOverride None + Order allow,deny + Allow from all ErrorLog /var/log/apache2/error.log diff --git a/install/update.php b/install/update.php index 5572f54288615577b02f1cdd38f9c9589312fb6a..5cec040e59cb6eeacffb321e5512799449feda91 100644 --- a/install/update.php +++ b/install/update.php @@ -38,6 +38,8 @@ require_once('lib/install.lib.php'); // 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/lib/'.$distname.'.lib.php'); 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 @@ $inst->db = new db(); // 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 @@ if($conf["mysql_server_admin_password"] != '') { // 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 @@ foreach($db_tables as $table) { } // 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 @@ system("/etc/init.d/mydns restart"); echo "Update finished.\n"; -?> \ No newline at end of file +?>