From 28c819b4402c79db059e584c61af6d8289a3f4d5 Mon Sep 17 00:00:00 2001
From: marknl <marknl@ispconfig3>
Date: Tue, 09 Aug 2011 16:44:21 -0400
Subject: [PATCH] Added mysql table check/repair for ISPConfig database while running (auto)update.
---
install/lib/update.lib.php | 566 ++++++++--------
install/update.php | 768 +++++++++++-----------
install/autoupdate.php | 633 +++++++++---------
3 files changed, 1,001 insertions(+), 966 deletions(-)
diff --git a/install/autoupdate.php b/install/autoupdate.php
index 5e32e82..b5e8999 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -1,314 +1,319 @@
-<?php
-/*
-Copyright (c) 2007-2010, 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.
-*/
-
-/*
- ISPConfig 3 updater.
-*/
-
-error_reporting(E_ALL|E_STRICT);
-
-/*
- * If the auto-updater flag is not on (the file does not exist) then cancel the auto-update!
-*/
-if (!file_exists('autoupdate')) {
-
- //** The banner on the command line
- echo "\n\n".str_repeat('-',80)."\n";
- echo " _____ ___________ _____ __ _ ____
-|_ _/ ___| ___ \ / __ \ / _(_) /__ \
- | | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _ _/ /
- | | `--. \ __/ | | / _ \| '_ \| _| |/ _` | |_ |
- _| |_/\__/ / | | \__/\ (_) | | | | | | | (_| | ___\ \
- \___/\____/\_| \____/\___/|_| |_|_| |_|\__, | \____/
- __/ |
- |___/ ";
- echo "\n".str_repeat('-',80)."\n";
- echo "\n\n>>This script is for internal use only! Please use update.php! \n\n";
- exit;
-}
-
-//** Include the library with the basic installer functions
-require_once('lib/install.lib.php');
-
-//** Include the library with the basic updater functions
-require_once('lib/update.lib.php');
-
-//** Include the base class of the installer class
-require_once('lib/installer_base.lib.php');
-
-//** Ensure that current working directory is install directory
-$cur_dir = getcwd();
-if(realpath(dirname(__FILE__)) != $cur_dir) die("Please run installation/update from _inside_ the install directory!\n");
-
-//** Install logfile
-define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
-define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
-
-//** Get distribution identifier
-$dist = get_distname();
-
-include_once("/usr/local/ispconfig/server/lib/config.inc.php");
-$conf_old = $conf;
-unset($conf);
-
-if($dist['id'] == '') die('Linux distribution or version not recognized.');
-
-//** Include the distribution-specific installer class library and configuration
-if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
-include_once('dist/lib/'.$dist['id'].'.lib.php');
-include_once('dist/conf/'.$dist['id'].'.conf.php');
-
-//** Get hostname
-exec('hostname -f', $tmp_out);
-$conf['hostname'] = $tmp_out[0];
-unset($tmp_out);
-
-//** Set the mysql login information
-$conf["mysql"]["host"] = $conf_old["db_host"];
-$conf["mysql"]["database"] = $conf_old["db_database"];
-$conf['mysql']['charset'] = 'utf8';
-$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
-$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
-$conf['language'] = $conf_old['language'];
-if($conf['language'] == '{language}') $conf['language'] = 'en';
-
-if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
-if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];
-if(isset($conf_old["dbmaster_user"])) $conf["mysql"]["master_ispconfig_user"] = $conf_old["dbmaster_user"];
-if(isset($conf_old["dbmaster_password"])) $conf["mysql"]["master_ispconfig_password"] = $conf_old["dbmaster_password"];
-
-//* Check if this is a master / slave setup
-$conf['mysql']['master_slave_setup'] = 'n';
-if($conf["mysql"]["master_host"] != '' && $conf["mysql"]["host"] != $conf["mysql"]["master_host"]) {
- $conf['mysql']['master_slave_setup'] = 'y';
-}
-
-// Resolve the IP address of the mysql hostname.
-if(!$conf['mysql']['ip'] = gethostbyname($conf['mysql']['host'])) die('Unable to resolve hostname'.$conf['mysql']['host']);
-
-$conf['server_id'] = intval($conf_old["server_id"]);
-$conf['ispconfig_log_priority'] = $conf_old["log_priority"];
-
-$inst = new installer();
-$inst->is_update = true;
-
-//** Detect the installed applications
-$inst->find_installed_apps();
-
-//** Initialize the MySQL server connection
-include_once('lib/mysql.lib.php');
-
-//** Database update is a bit brute force and should be rebuild later ;)
-
-/*
- * Try to read the DB-admin settings
- */
-$clientdb_host = '';
-$clientdb_user = '';
-$clientdb_password = '';
-include_once("/usr/local/ispconfig/server/lib/mysql_clientdb.conf");
-$conf["mysql"]["admin_user"] = $clientdb_user;
-$conf["mysql"]["admin_password"] = $clientdb_password;
-$clientdb_host = '';
-$clientdb_user = '';
-$clientdb_password = '';
-
-//** There is a error if user for mysql admin_password if empty
-if( empty($conf["mysql"]["admin_password"]) ) {
- die("internal error - MYSQL-Root passord not known");
-}
-
-/*
- * Prepare the dump of the database
-*/
-prepareDBDump();
-
-//* initialize the database
-$inst->db = new db();
-
-/*
- * The next line is a bit tricky!
- * At the automated update we have no connection to the master-db (we don't need it, because
- * there are only TWO points, where this is needed)
- * 1) update the rights --> the autoupdater sets the rights of all clients when the server is
- * autoupdated)
- * 2) update the server-settings (is web installed, is mail installed) --> the autoupdates
- * doesn't change any of this settings, so there ist no need to update this.
- * This means, the autoupdater did not need any connection to the master-db (only to the local bd
- * of the master-server). To avoid any problems, we set the master-db to the local one.
- */
-$inst->dbmaster = $inst->db;
-
-/*
- * If it is NOT a master-slave - Setup then we are at the Master-DB. So set all rights
-*/
-if($conf['mysql']['master_slave_setup'] != 'y') {
- $inst->grant_master_database_rights(true);
-}
-
-/*
- * dump the new Database and reconfigure the server.ini
- */
-updateDbAndIni();
-
-/*
- * Reconfigure all Services
- */
-if($conf['services']['mail'] == true) {
- //** Configure postfix
- swriteln('Configuring Postfix');
- $inst->configure_postfix('dont-create-certs');
-
- //** Configure mailman
- swriteln('Configuring Mailman');
- $inst->configure_mailman('update');
-
- //* Configure Jailkit
- swriteln('Configuring Jailkit');
- $inst->configure_jailkit();
-
- if($conf['dovecot']['installed'] == true) {
- //* Configure dovecot
- swriteln('Configuring Dovecot');
- $inst->configure_dovecot();
- } else {
- //** Configure saslauthd
- swriteln('Configuring SASL');
- $inst->configure_saslauthd();
-
- //** Configure PAM
- swriteln('Configuring PAM');
- $inst->configure_pam();
-
- //* Configure courier
- swriteln('Configuring Courier');
- $inst->configure_courier();
- }
-
- //** Configure Spamasassin
- swriteln('Configuring Spamassassin');
- $inst->configure_spamassassin();
-
- //** Configure Amavis
- swriteln('Configuring Amavisd');
- $inst->configure_amavis();
-
- //** Configure Getmail
- swriteln('Configuring Getmail');
- $inst->configure_getmail();
-}
-
-if($conf['services']['web'] == true) {
- //** Configure Pureftpd
- swriteln('Configuring Pureftpd');
- $inst->configure_pureftpd();
-}
-
-if($conf['services']['dns'] == true) {
- //* Configure DNS
- if($conf['powerdns']['installed'] == true) {
- swriteln('Configuring PowerDNS');
- $inst->configure_powerdns();
- } elseif($conf['bind']['installed'] == true) {
- swriteln('Configuring BIND');
- $inst->configure_bind();
- } else {
- swriteln('Configuring MyDNS');
- $inst->configure_mydns();
- }
-}
-
-if($conf['services']['web'] == true) {
- //** Configure Apache
- swriteln('Configuring Apache');
- $inst->configure_apache();
-
- //** Configure vlogger
- swriteln('Configuring vlogger');
- $inst->configure_vlogger();
-
- //** Configure apps vhost
- swriteln('Configuring Apps vhost');
- $inst->configure_apps_vhost();
-}
-
-
-//* Configure DBServer
-swriteln('Configuring Database');
-$inst->configure_dbserver();
-
-
-//if(@is_dir('/etc/Bastille')) {
-//* Configure Firewall
-swriteln('Configuring Firewall');
-$inst->configure_firewall();
-//}
-
-//** Configure ISPConfig
-swriteln('Updating ISPConfig');
-
-
-//** Customise the port ISPConfig runs on
-$conf['apache']['vhost_port'] = get_ispconfig_port_number();
-
-$inst->install_ispconfig();
-
-//** Configure Crontab
-swriteln('Updating Crontab');
-$inst->install_crontab();
-
-//** Restart services:
-swriteln('Restarting services ...');
-if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script'])) system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' reload');
-if($conf['services']['mail']) {
- if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script'])) system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
- if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'])) system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
- if($conf['amavis']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['amavis']['init_script'])) system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
- if($conf['clamav']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['clamav']['init_script'])) system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
- if($conf['courier']['courier-authdaemon'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
- if($conf['courier']['courier-imap'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
- if($conf['courier']['courier-imap-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
- if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
- if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
- if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
- if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
-}
-if($conf['services']['web']) {
- if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
- if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'])) system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
-}
-if($conf['services']['dns']) {
- if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script'])) system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
- if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script'])) system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
- if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
-}
-
-echo "Update finished.\n";
-
-?>
+<?php
+/*
+Copyright (c) 2007-2010, 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.
+*/
+
+/*
+ ISPConfig 3 updater.
+*/
+
+error_reporting(E_ALL|E_STRICT);
+
+/*
+ * If the auto-updater flag is not on (the file does not exist) then cancel the auto-update!
+*/
+if (!file_exists('autoupdate')) {
+
+ //** The banner on the command line
+ echo "\n\n".str_repeat('-',80)."\n";
+ echo " _____ ___________ _____ __ _ ____
+|_ _/ ___| ___ \ / __ \ / _(_) /__ \
+ | | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _ _/ /
+ | | `--. \ __/ | | / _ \| '_ \| _| |/ _` | |_ |
+ _| |_/\__/ / | | \__/\ (_) | | | | | | | (_| | ___\ \
+ \___/\____/\_| \____/\___/|_| |_|_| |_|\__, | \____/
+ __/ |
+ |___/ ";
+ echo "\n".str_repeat('-',80)."\n";
+ echo "\n\n>>This script is for internal use only! Please use update.php! \n\n";
+ exit;
+}
+
+//** Include the library with the basic installer functions
+require_once('lib/install.lib.php');
+
+//** Include the library with the basic updater functions
+require_once('lib/update.lib.php');
+
+//** Include the base class of the installer class
+require_once('lib/installer_base.lib.php');
+
+//** Ensure that current working directory is install directory
+$cur_dir = getcwd();
+if(realpath(dirname(__FILE__)) != $cur_dir) die("Please run installation/update from _inside_ the install directory!\n");
+
+//** Install logfile
+define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
+define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
+
+//** Get distribution identifier
+$dist = get_distname();
+
+include_once("/usr/local/ispconfig/server/lib/config.inc.php");
+$conf_old = $conf;
+unset($conf);
+
+if($dist['id'] == '') die('Linux distribution or version not recognized.');
+
+//** Include the distribution-specific installer class library and configuration
+if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
+include_once('dist/lib/'.$dist['id'].'.lib.php');
+include_once('dist/conf/'.$dist['id'].'.conf.php');
+
+//** Get hostname
+exec('hostname -f', $tmp_out);
+$conf['hostname'] = $tmp_out[0];
+unset($tmp_out);
+
+//** Set the mysql login information
+$conf["mysql"]["host"] = $conf_old["db_host"];
+$conf["mysql"]["database"] = $conf_old["db_database"];
+$conf['mysql']['charset'] = 'utf8';
+$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
+$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
+$conf['language'] = $conf_old['language'];
+if($conf['language'] == '{language}') $conf['language'] = 'en';
+
+if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
+if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];
+if(isset($conf_old["dbmaster_user"])) $conf["mysql"]["master_ispconfig_user"] = $conf_old["dbmaster_user"];
+if(isset($conf_old["dbmaster_password"])) $conf["mysql"]["master_ispconfig_password"] = $conf_old["dbmaster_password"];
+
+//* Check if this is a master / slave setup
+$conf['mysql']['master_slave_setup'] = 'n';
+if($conf["mysql"]["master_host"] != '' && $conf["mysql"]["host"] != $conf["mysql"]["master_host"]) {
+ $conf['mysql']['master_slave_setup'] = 'y';
+}
+
+// Resolve the IP address of the mysql hostname.
+if(!$conf['mysql']['ip'] = gethostbyname($conf['mysql']['host'])) die('Unable to resolve hostname'.$conf['mysql']['host']);
+
+$conf['server_id'] = intval($conf_old["server_id"]);
+$conf['ispconfig_log_priority'] = $conf_old["log_priority"];
+
+$inst = new installer();
+$inst->is_update = true;
+
+//** Detect the installed applications
+$inst->find_installed_apps();
+
+//** Initialize the MySQL server connection
+include_once('lib/mysql.lib.php');
+
+//** Database update is a bit brute force and should be rebuild later ;)
+
+/*
+ * Try to read the DB-admin settings
+ */
+$clientdb_host = '';
+$clientdb_user = '';
+$clientdb_password = '';
+include_once("/usr/local/ispconfig/server/lib/mysql_clientdb.conf");
+$conf["mysql"]["admin_user"] = $clientdb_user;
+$conf["mysql"]["admin_password"] = $clientdb_password;
+$clientdb_host = '';
+$clientdb_user = '';
+$clientdb_password = '';
+
+//** There is a error if user for mysql admin_password if empty
+if( empty($conf["mysql"]["admin_password"]) ) {
+ die("internal error - MYSQL-Root passord not known");
+}
+
+/*
+ * Check all tables
+*/
+checkDbHealth();
+
+/*
+ * Prepare the dump of the database
+*/
+prepareDBDump();
+
+//* initialize the database
+$inst->db = new db();
+
+/*
+ * The next line is a bit tricky!
+ * At the automated update we have no connection to the master-db (we don't need it, because
+ * there are only TWO points, where this is needed)
+ * 1) update the rights --> the autoupdater sets the rights of all clients when the server is
+ * autoupdated)
+ * 2) update the server-settings (is web installed, is mail installed) --> the autoupdates
+ * doesn't change any of this settings, so there ist no need to update this.
+ * This means, the autoupdater did not need any connection to the master-db (only to the local bd
+ * of the master-server). To avoid any problems, we set the master-db to the local one.
+ */
+$inst->dbmaster = $inst->db;
+
+/*
+ * If it is NOT a master-slave - Setup then we are at the Master-DB. So set all rights
+*/
+if($conf['mysql']['master_slave_setup'] != 'y') {
+ $inst->grant_master_database_rights(true);
+}
+
+/*
+ * dump the new Database and reconfigure the server.ini
+ */
+updateDbAndIni();
+
+/*
+ * Reconfigure all Services
+ */
+if($conf['services']['mail'] == true) {
+ //** Configure postfix
+ swriteln('Configuring Postfix');
+ $inst->configure_postfix('dont-create-certs');
+
+ //** Configure mailman
+ swriteln('Configuring Mailman');
+ $inst->configure_mailman('update');
+
+ //* Configure Jailkit
+ swriteln('Configuring Jailkit');
+ $inst->configure_jailkit();
+
+ if($conf['dovecot']['installed'] == true) {
+ //* Configure dovecot
+ swriteln('Configuring Dovecot');
+ $inst->configure_dovecot();
+ } else {
+ //** Configure saslauthd
+ swriteln('Configuring SASL');
+ $inst->configure_saslauthd();
+
+ //** Configure PAM
+ swriteln('Configuring PAM');
+ $inst->configure_pam();
+
+ //* Configure courier
+ swriteln('Configuring Courier');
+ $inst->configure_courier();
+ }
+
+ //** Configure Spamasassin
+ swriteln('Configuring Spamassassin');
+ $inst->configure_spamassassin();
+
+ //** Configure Amavis
+ swriteln('Configuring Amavisd');
+ $inst->configure_amavis();
+
+ //** Configure Getmail
+ swriteln('Configuring Getmail');
+ $inst->configure_getmail();
+}
+
+if($conf['services']['web'] == true) {
+ //** Configure Pureftpd
+ swriteln('Configuring Pureftpd');
+ $inst->configure_pureftpd();
+}
+
+if($conf['services']['dns'] == true) {
+ //* Configure DNS
+ if($conf['powerdns']['installed'] == true) {
+ swriteln('Configuring PowerDNS');
+ $inst->configure_powerdns();
+ } elseif($conf['bind']['installed'] == true) {
+ swriteln('Configuring BIND');
+ $inst->configure_bind();
+ } else {
+ swriteln('Configuring MyDNS');
+ $inst->configure_mydns();
+ }
+}
+
+if($conf['services']['web'] == true) {
+ //** Configure Apache
+ swriteln('Configuring Apache');
+ $inst->configure_apache();
+
+ //** Configure vlogger
+ swriteln('Configuring vlogger');
+ $inst->configure_vlogger();
+
+ //** Configure apps vhost
+ swriteln('Configuring Apps vhost');
+ $inst->configure_apps_vhost();
+}
+
+
+//* Configure DBServer
+swriteln('Configuring Database');
+$inst->configure_dbserver();
+
+
+//if(@is_dir('/etc/Bastille')) {
+//* Configure Firewall
+swriteln('Configuring Firewall');
+$inst->configure_firewall();
+//}
+
+//** Configure ISPConfig
+swriteln('Updating ISPConfig');
+
+
+//** Customise the port ISPConfig runs on
+$conf['apache']['vhost_port'] = get_ispconfig_port_number();
+
+$inst->install_ispconfig();
+
+//** Configure Crontab
+swriteln('Updating Crontab');
+$inst->install_crontab();
+
+//** Restart services:
+swriteln('Restarting services ...');
+if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script'])) system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' reload');
+if($conf['services']['mail']) {
+ if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script'])) system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
+ if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'])) system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
+ if($conf['amavis']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['amavis']['init_script'])) system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
+ if($conf['clamav']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['clamav']['init_script'])) system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
+ if($conf['courier']['courier-authdaemon'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
+ if($conf['courier']['courier-imap'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
+ if($conf['courier']['courier-imap-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
+ if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
+ if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
+ if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
+ if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
+}
+if($conf['services']['web']) {
+ if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
+ if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'])) system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
+}
+if($conf['services']['dns']) {
+ if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script'])) system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
+ if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script'])) system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
+ if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
+}
+
+echo "Update finished.\n";
+
+?>
diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index cf4809f..53ed189 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -1,270 +1,296 @@
-<?php
-/*
-Copyright (c) 2007-2010, 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.
-*/
-
-function prepareDBDump() {
- global $conf;
-
- //** load the pre update sql script do perform modifications on the database before the database is dumped
- if(is_file(ISPC_INSTALL_ROOT."/install/sql/pre_update.sql")) {
- if($conf['mysql']['admin_password'] == '') {
- caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
- } else {
- caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
- }
- }
-
- //** export the current database data
- if( !empty($conf["mysql"]["admin_password"]) ) {
-
- system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
- }
- else {
-
- system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
- }
-
- /*
- * If we have a server with nothing in it except VE's then the database of thie server is empty.
- * so the following line will no longer work!
- */
- //if(filesize('existing_db.sql') < 30000) die('Possible problem with dumping the database. We will stop here. Please check the file existing_db.sql');
-
- // create a backup copy of the ispconfig database in the root folder
- $backup_db_name = '/root/ispconfig_db_backup_'.@date('Y-m-d_h-i').'.sql';
- copy('existing_db.sql',$backup_db_name);
- chmod($backup_db_name, 0700);
- chown($backup_db_name, 'root');
- chgrp($backup_db_name, 'root');
-
- if ($conf['powerdns']['installed']) {
- //** export the current PowerDNS database data
- if( !empty($conf["mysql"]["admin_password"]) ) {
- system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
- } else {
- system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
- }
-
- // create a backup copy of the PowerDNS database in the root folder
- $backup_db_name = '/root/ispconfig_powerdns_db_backup_'.@date('Y-m-d_h-i').'.sql';
- copy('existing_powerdns_db.sql',$backup_db_name);
- chmod($backup_db_name, 0700);
- chown($backup_db_name, 'root');
- chgrp($backup_db_name, 'root');
- }
-}
-
-function updateDbAndIni() {
- global $inst, $conf;
-
- //* Update $conf array with values from the server.ini that shall be preserved
- $tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
- $ini_array = ini_to_array(stripslashes($tmp['config']));
- $current_db_version = (isset($tmp['dbversion']))?intval($tmp['dbversion']):0;
-
- if(count($ini_array) == 0) die('Unable to read server configuration from database.');
-
- $conf['services']['mail'] = ($tmp['mail_server'] == 1)?true:false;
- $conf['services']['web'] = ($tmp['web_server'] == 1)?true:false;
- $conf['services']['dns'] = ($tmp['dns_server'] == 1)?true:false;
- $conf['services']['file'] = ($tmp['file_server'] == 1)?true:false;
- $conf['services']['db'] = ($tmp['db_server'] == 1)?true:false;
- $conf['services']['vserver'] = ($tmp['vserver_server'] == 1)?true:false;
- $conf['services']['proxy'] = (isset($tmp['proxy_server']) && $tmp['proxy_server'] == 1)?true:false;
- $conf['services']['firewall'] = (isset($tmp['firewall_server']) && $tmp['firewall_server'] == 1)?true:false;
-
- $conf['postfix']['vmail_mailbox_base'] = $ini_array['mail']['homedir_path'];
-
- //* Do incremental DB updates only on installed ISPConfig versions > 3.0.3
- if(compare_ispconfig_version('3.0.3',ISPC_APP_VERSION) >= 0) {
-
- swriteln($inst->lng('Starting incremental database update.'));
-
- //* get the version of the db schema from the server table
- $found = true;
- while($found == true) {
- $next_db_version = intval($current_db_version + 1);
- $patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql';
- if(is_file($patch_filename)) {
- //* Load patch file into database
- if( !empty($conf["mysql"]["admin_password"]) ) {
- system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < ".$patch_filename);
- } else {
- system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < ".$patch_filename);
- }
- swriteln($inst->lng('Loading SQL patch file').': '.$patch_filename);
- $current_db_version = $next_db_version;
- } else {
- $found = false;
- }
- }
-
- //* update the database version in server table
- $inst->db->query("UPDATE ".$conf["mysql"]["database"].".server SET dbversion = '".$current_db_version."' WHERE server_id = ".$conf['server_id']);
-
-
- //* If ISPConfig Version < 3.0.3, we will do a full db update
- } else {
-
- swriteln($inst->lng('Starting full database update.'));
-
- //** Delete the old database
- if( !$inst->db->query('DROP DATABASE IF EXISTS '.$conf['mysql']['database']) ) {
- $inst->error('Unable to drop MySQL database: '.$conf['mysql']['database'].'.');
- }
-
- //** Create the mysql database
- $inst->configure_database();
-
- //** empty all databases
- $db_tables = $inst->db->getTables();
-
- foreach($db_tables as $table) {
- $inst->db->query("TRUNCATE $table");
- }
-
- //** load old data back into database
- if( !empty($conf["mysql"]["admin_password"]) ) {
- system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < existing_db.sql");
- } else {
- system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql");
- }
-
- //** Get the database version number based on the patchfile
- $found = true;
- while($found == true) {
- $next_db_version = intval($current_db_version + 1);
- $patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql';
- if(is_file($patch_filename)) {
- $current_db_version = $next_db_version;
- } else {
- $found = false;
- }
- }
-
- //* update the database version in server table
- $inst->db->query("UPDATE ".$conf["mysql"]["database"].".server SET dbversion = '".$current_db_version."' WHERE server_id = ".$conf['server_id']);
-
- if ($conf['powerdns']['installed']) {
-
- swriteln($inst->lng('Starting full PowerDNS database update.'));
-
- //** Delete the old PowerDNS database
- if( !$inst->db->query('DROP DATABASE IF EXISTS '.$conf['powerdns']['database']) ) {
- $inst->error('Unable to drop MySQL database: '.$conf['powerdns']['database'].'.');
- }
-
- //** Create the mysql database
- $inst->configure_powerdns();
-
- //** load old data back into the PowerDNS database
- if( !empty($conf["mysql"]["admin_password"]) ) {
- system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['powerdns']['database']." < existing_powerdns_db.sql");
- } else {
- system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['powerdns']['database']." < existing_powerdns_db.sql");
- }
- }
- }
-
-
- //** Update server ini
- $tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
- $old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
- unset($tmp_server_rec);
- $tpl_ini_array = ini_to_array(rf('tpl/server.ini.master'));
-
- //* Update further distribution specific parameters for server config here
- //* HINT: Every line added here has to be added in installer_base.lib.php too!!
- $tpl_ini_array['web']['vhost_conf_dir'] = $conf['apache']['vhost_conf_dir'];
- $tpl_ini_array['web']['vhost_conf_enabled_dir'] = $conf['apache']['vhost_conf_enabled_dir'];
- $tpl_ini_array['jailkit']['jailkit_chroot_app_programs'] = $conf['jailkit']['jailkit_chroot_app_programs'];
- $tpl_ini_array['fastcgi']['fastcgi_phpini_path'] = $conf['fastcgi']['fastcgi_phpini_path'];
- $tpl_ini_array['fastcgi']['fastcgi_starter_path'] = $conf['fastcgi']['fastcgi_starter_path'];
- $tpl_ini_array['server']['hostname'] = $conf['hostname'];
- $tpl_ini_array['server']['ip_address'] = @gethostbyname($conf['hostname']);
- $tpl_ini_array['web']['website_basedir'] = $conf['web']['website_basedir'];
- $tpl_ini_array['web']['website_path'] = $conf['web']['website_path'];
- $tpl_ini_array['web']['website_symlinks'] = $conf['web']['website_symlinks'];
- $tpl_ini_array['cron']['crontab_dir'] = $conf['cron']['crontab_dir'];
- $tpl_ini_array['web']['security_level'] = 20;
- $tpl_ini_array['web']['user'] = $conf['apache']['user'];
- $tpl_ini_array['web']['group'] = $conf['apache']['group'];
- $tpl_ini_array['web']['php_ini_path_apache'] = $conf['apache']['php_ini_path_apache'];
- $tpl_ini_array['web']['php_ini_path_cgi'] = $conf['apache']['php_ini_path_cgi'];
- $tpl_ini_array['mail']['pop3_imap_daemon'] = ($conf['dovecot']['installed'] == true)?'dovecot':'courier';
- $tpl_ini_array['mail']['mail_filter_syntax'] = ($conf['dovecot']['installed'] == true)?'sieve':'maildrop';
- $tpl_ini_array['dns']['bind_user'] = $conf['bind']['bind_user'];
- $tpl_ini_array['dns']['bind_group'] = $conf['bind']['bind_group'];
- $tpl_ini_array['dns']['bind_zonefiles_dir'] = $conf['bind']['bind_zonefiles_dir'];
- $tpl_ini_array['dns']['named_conf_path'] = $conf['bind']['named_conf_path'];
- $tpl_ini_array['dns']['named_conf_local_path'] = $conf['bind']['named_conf_local_path'];
-
- // update the new template with the old values
- if(is_array($old_ini_array)) {
- foreach($old_ini_array as $tmp_section_name => $tmp_section_content) {
- foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) {
- $tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content;
- }
- }
- }
-
- $new_ini = array_to_ini($tpl_ini_array);
- $inst->db->query("UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id']);
- unset($old_ini_array);
- unset($tpl_ini_array);
- unset($new_ini);
-
-
- //** Update system ini
- $tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM sys_ini WHERE sysini_id = 1");
- $old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
- unset($tmp_server_rec);
- $tpl_ini_array = ini_to_array(rf('tpl/system.ini.master'));
-
- // update the new template with the old values
- if(is_array($old_ini_array)) {
- foreach($old_ini_array as $tmp_section_name => $tmp_section_content) {
- foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) {
- $tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content;
- }
- }
- }
-
- $new_ini = array_to_ini($tpl_ini_array);
- $tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM sys_ini WHERE 1');
- if($tmp['number'] == 0) {
- $inst->db->query("INSERT INTO sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')");
- } else {
- $inst->db->query("UPDATE sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1");
- }
- unset($old_ini_array);
- unset($tpl_ini_array);
- unset($new_ini);
-}
-
-?>
+<?php
+/*
+Copyright (c) 2007-2010, 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.
+*/
+
+function prepareDBDump() {
+ global $conf;
+
+ //** load the pre update sql script do perform modifications on the database before the database is dumped
+ if(is_file(ISPC_INSTALL_ROOT."/install/sql/pre_update.sql")) {
+ if($conf['mysql']['admin_password'] == '') {
+ caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
+ } else {
+ caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
+ }
+ }
+
+ //** export the current database data
+ if( !empty($conf["mysql"]["admin_password"]) ) {
+
+ system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
+ }
+ else {
+
+ system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --create-options --quick --result-file=existing_db.sql ".$conf['mysql']['database']);
+ }
+
+ /*
+ * If we have a server with nothing in it except VE's then the database of thie server is empty.
+ * so the following line will no longer work!
+ */
+ //if(filesize('existing_db.sql') < 30000) die('Possible problem with dumping the database. We will stop here. Please check the file existing_db.sql');
+
+ // create a backup copy of the ispconfig database in the root folder
+ $backup_db_name = '/root/ispconfig_db_backup_'.@date('Y-m-d_h-i').'.sql';
+ copy('existing_db.sql',$backup_db_name);
+ chmod($backup_db_name, 0700);
+ chown($backup_db_name, 'root');
+ chgrp($backup_db_name, 'root');
+
+ if ($conf['powerdns']['installed']) {
+ //** export the current PowerDNS database data
+ if( !empty($conf["mysql"]["admin_password"]) ) {
+ system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
+ } else {
+ system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --create-options --quick --result-file=existing_powerdns_db.sql ".$conf['powerdns']['database']);
+ }
+
+ // create a backup copy of the PowerDNS database in the root folder
+ $backup_db_name = '/root/ispconfig_powerdns_db_backup_'.@date('Y-m-d_h-i').'.sql';
+ copy('existing_powerdns_db.sql',$backup_db_name);
+ chmod($backup_db_name, 0700);
+ chown($backup_db_name, 'root');
+ chgrp($backup_db_name, 'root');
+ }
+}
+
+function checkDbHealth() {
+ global $conf;
+
+ //* Array containing non OK tables (can be repaired, crashed, corrupt)
+ $notok = array();
+
+ echo "Checking ISPConfig database .. ";
+ exec("mysqlcheck -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' -r ".$conf["mysql"]["database"], $result);
+ for( $i=0; $i<sizeof($result);$i++) {
+ if ( substr($result[$i], -2) != "OK" ) {
+ $notok[] = $result[$i];
+ }
+ }
+
+ if ( sizeof($notok) > 0 ) {
+ echo "\nSome tables where not 'OK'. Please check the list below.\n\n";
+ foreach ($notok as $key => $value) {
+ echo "$value\n";
+ }
+ echo "\nPress enter to continue or CTRL-C to cancel the installation ..";
+ sread();
+ }
+ else
+ echo "OK\n";
+}
+
+function updateDbAndIni() {
+ global $inst, $conf;
+
+ //* Update $conf array with values from the server.ini that shall be preserved
+ $tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
+ $ini_array = ini_to_array(stripslashes($tmp['config']));
+ $current_db_version = (isset($tmp['dbversion']))?intval($tmp['dbversion']):0;
+
+ if(count($ini_array) == 0) die('Unable to read server configuration from database.');
+
+ $conf['services']['mail'] = ($tmp['mail_server'] == 1)?true:false;
+ $conf['services']['web'] = ($tmp['web_server'] == 1)?true:false;
+ $conf['services']['dns'] = ($tmp['dns_server'] == 1)?true:false;
+ $conf['services']['file'] = ($tmp['file_server'] == 1)?true:false;
+ $conf['services']['db'] = ($tmp['db_server'] == 1)?true:false;
+ $conf['services']['vserver'] = ($tmp['vserver_server'] == 1)?true:false;
+ $conf['services']['proxy'] = (isset($tmp['proxy_server']) && $tmp['proxy_server'] == 1)?true:false;
+ $conf['services']['firewall'] = (isset($tmp['firewall_server']) && $tmp['firewall_server'] == 1)?true:false;
+
+ $conf['postfix']['vmail_mailbox_base'] = $ini_array['mail']['homedir_path'];
+
+ //* Do incremental DB updates only on installed ISPConfig versions > 3.0.3
+ if(compare_ispconfig_version('3.0.3',ISPC_APP_VERSION) >= 0) {
+
+ swriteln($inst->lng('Starting incremental database update.'));
+
+ //* get the version of the db schema from the server table
+ $found = true;
+ while($found == true) {
+ $next_db_version = intval($current_db_version + 1);
+ $patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql';
+ if(is_file($patch_filename)) {
+ //* Load patch file into database
+ if( !empty($conf["mysql"]["admin_password"]) ) {
+ system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < ".$patch_filename);
+ } else {
+ system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < ".$patch_filename);
+ }
+ swriteln($inst->lng('Loading SQL patch file').': '.$patch_filename);
+ $current_db_version = $next_db_version;
+ } else {
+ $found = false;
+ }
+ }
+
+ //* update the database version in server table
+ $inst->db->query("UPDATE ".$conf["mysql"]["database"].".server SET dbversion = '".$current_db_version."' WHERE server_id = ".$conf['server_id']);
+
+
+ //* If ISPConfig Version < 3.0.3, we will do a full db update
+ } else {
+
+ swriteln($inst->lng('Starting full database update.'));
+
+ //** Delete the old database
+ if( !$inst->db->query('DROP DATABASE IF EXISTS '.$conf['mysql']['database']) ) {
+ $inst->error('Unable to drop MySQL database: '.$conf['mysql']['database'].'.');
+ }
+
+ //** Create the mysql database
+ $inst->configure_database();
+
+ //** empty all databases
+ $db_tables = $inst->db->getTables();
+
+ foreach($db_tables as $table) {
+ $inst->db->query("TRUNCATE $table");
+ }
+
+ //** load old data back into database
+ if( !empty($conf["mysql"]["admin_password"]) ) {
+ system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < existing_db.sql");
+ } else {
+ system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql");
+ }
+
+ //** Get the database version number based on the patchfile
+ $found = true;
+ while($found == true) {
+ $next_db_version = intval($current_db_version + 1);
+ $patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql';
+ if(is_file($patch_filename)) {
+ $current_db_version = $next_db_version;
+ } else {
+ $found = false;
+ }
+ }
+
+ //* update the database version in server table
+ $inst->db->query("UPDATE ".$conf["mysql"]["database"].".server SET dbversion = '".$current_db_version."' WHERE server_id = ".$conf['server_id']);
+
+ if ($conf['powerdns']['installed']) {
+
+ swriteln($inst->lng('Starting full PowerDNS database update.'));
+
+ //** Delete the old PowerDNS database
+ if( !$inst->db->query('DROP DATABASE IF EXISTS '.$conf['powerdns']['database']) ) {
+ $inst->error('Unable to drop MySQL database: '.$conf['powerdns']['database'].'.');
+ }
+
+ //** Create the mysql database
+ $inst->configure_powerdns();
+
+ //** load old data back into the PowerDNS database
+ if( !empty($conf["mysql"]["admin_password"]) ) {
+ system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['powerdns']['database']." < existing_powerdns_db.sql");
+ } else {
+ system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['powerdns']['database']." < existing_powerdns_db.sql");
+ }
+ }
+ }
+
+
+ //** Update server ini
+ $tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
+ $old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
+ unset($tmp_server_rec);
+ $tpl_ini_array = ini_to_array(rf('tpl/server.ini.master'));
+
+ //* Update further distribution specific parameters for server config here
+ //* HINT: Every line added here has to be added in installer_base.lib.php too!!
+ $tpl_ini_array['web']['vhost_conf_dir'] = $conf['apache']['vhost_conf_dir'];
+ $tpl_ini_array['web']['vhost_conf_enabled_dir'] = $conf['apache']['vhost_conf_enabled_dir'];
+ $tpl_ini_array['jailkit']['jailkit_chroot_app_programs'] = $conf['jailkit']['jailkit_chroot_app_programs'];
+ $tpl_ini_array['fastcgi']['fastcgi_phpini_path'] = $conf['fastcgi']['fastcgi_phpini_path'];
+ $tpl_ini_array['fastcgi']['fastcgi_starter_path'] = $conf['fastcgi']['fastcgi_starter_path'];
+ $tpl_ini_array['server']['hostname'] = $conf['hostname'];
+ $tpl_ini_array['server']['ip_address'] = @gethostbyname($conf['hostname']);
+ $tpl_ini_array['web']['website_basedir'] = $conf['web']['website_basedir'];
+ $tpl_ini_array['web']['website_path'] = $conf['web']['website_path'];
+ $tpl_ini_array['web']['website_symlinks'] = $conf['web']['website_symlinks'];
+ $tpl_ini_array['cron']['crontab_dir'] = $conf['cron']['crontab_dir'];
+ $tpl_ini_array['web']['security_level'] = 20;
+ $tpl_ini_array['web']['user'] = $conf['apache']['user'];
+ $tpl_ini_array['web']['group'] = $conf['apache']['group'];
+ $tpl_ini_array['web']['php_ini_path_apache'] = $conf['apache']['php_ini_path_apache'];
+ $tpl_ini_array['web']['php_ini_path_cgi'] = $conf['apache']['php_ini_path_cgi'];
+ $tpl_ini_array['mail']['pop3_imap_daemon'] = ($conf['dovecot']['installed'] == true)?'dovecot':'courier';
+ $tpl_ini_array['mail']['mail_filter_syntax'] = ($conf['dovecot']['installed'] == true)?'sieve':'maildrop';
+ $tpl_ini_array['dns']['bind_user'] = $conf['bind']['bind_user'];
+ $tpl_ini_array['dns']['bind_group'] = $conf['bind']['bind_group'];
+ $tpl_ini_array['dns']['bind_zonefiles_dir'] = $conf['bind']['bind_zonefiles_dir'];
+ $tpl_ini_array['dns']['named_conf_path'] = $conf['bind']['named_conf_path'];
+ $tpl_ini_array['dns']['named_conf_local_path'] = $conf['bind']['named_conf_local_path'];
+
+ // update the new template with the old values
+ if(is_array($old_ini_array)) {
+ foreach($old_ini_array as $tmp_section_name => $tmp_section_content) {
+ foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) {
+ $tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content;
+ }
+ }
+ }
+
+ $new_ini = array_to_ini($tpl_ini_array);
+ $inst->db->query("UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id']);
+ unset($old_ini_array);
+ unset($tpl_ini_array);
+ unset($new_ini);
+
+
+ //** Update system ini
+ $tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM sys_ini WHERE sysini_id = 1");
+ $old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
+ unset($tmp_server_rec);
+ $tpl_ini_array = ini_to_array(rf('tpl/system.ini.master'));
+
+ // update the new template with the old values
+ if(is_array($old_ini_array)) {
+ foreach($old_ini_array as $tmp_section_name => $tmp_section_content) {
+ foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) {
+ $tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content;
+ }
+ }
+ }
+
+ $new_ini = array_to_ini($tpl_ini_array);
+ $tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM sys_ini WHERE 1');
+ if($tmp['number'] == 0) {
+ $inst->db->query("INSERT INTO sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')");
+ } else {
+ $inst->db->query("UPDATE sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1");
+ }
+ unset($old_ini_array);
+ unset($tpl_ini_array);
+ unset($new_ini);
+}
+
+?>
diff --git a/install/update.php b/install/update.php
index e568b26..9a47e2c 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,383 +1,387 @@
-<?php
-
-/*
-Copyright (c) 2007-2010, 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.
-*/
-
-/*
- ISPConfig 3 updater.
-*/
-
-error_reporting(E_ALL|E_STRICT);
-
-//** The banner on the command line
-echo "\n\n".str_repeat('-',80)."\n";
-echo " _____ ___________ _____ __ _ ____
-|_ _/ ___| ___ \ / __ \ / _(_) /__ \
- | | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _ _/ /
- | | `--. \ __/ | | / _ \| '_ \| _| |/ _` | |_ |
- _| |_/\__/ / | | \__/\ (_) | | | | | | | (_| | ___\ \
- \___/\____/\_| \____/\___/|_| |_|_| |_|\__, | \____/
- __/ |
- |___/ ";
-echo "\n".str_repeat('-',80)."\n";
-echo "\n\n>> Update \n\n";
-
-//** Include the library with the basic installer functions
-require_once('lib/install.lib.php');
-
-//** Include the library with the basic updater functions
-require_once('lib/update.lib.php');
-
-//** Include the base class of the installer class
-require_once('lib/installer_base.lib.php');
-
-//** Ensure that current working directory is install directory
-$cur_dir = getcwd();
-if(realpath(dirname(__FILE__)) != $cur_dir) die("Please run installation/update from _inside_ the install directory!\n");
-
-//** Install logfile
-define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
-define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
-
-//** Check for ISPConfig 2.x versions
-if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
- die('This software cannot be installed on a server wich runs ISPConfig 2.x.');
-}
-
-//** Get distribution identifier
-$dist = get_distname();
-
-include_once("/usr/local/ispconfig/server/lib/config.inc.php");
-$conf_old = $conf;
-unset($conf);
-
-if($dist['id'] == '') die('Linux distribution or version not recognized.');
-
-//** Include the distribution-specific installer class library and configuration
-if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
-include_once('dist/lib/'.$dist['id'].'.lib.php');
-include_once('dist/conf/'.$dist['id'].'.conf.php');
-
-//** Get hostname
-exec('hostname -f', $tmp_out);
-$conf['hostname'] = $tmp_out[0];
-unset($tmp_out);
-
-//** Set the mysql login information
-$conf["mysql"]["host"] = $conf_old["db_host"];
-$conf["mysql"]["database"] = $conf_old["db_database"];
-$conf['mysql']['charset'] = 'utf8';
-$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
-$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
-$conf['language'] = $conf_old['language'];
-if($conf['language'] == '{language}') $conf['language'] = 'en';
-
-if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
-if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];
-if(isset($conf_old["dbmaster_user"])) $conf["mysql"]["master_ispconfig_user"] = $conf_old["dbmaster_user"];
-if(isset($conf_old["dbmaster_password"])) $conf["mysql"]["master_ispconfig_password"] = $conf_old["dbmaster_password"];
-
-//* Check if this is a master / slave setup
-if($conf["mysql"]["master_host"] != '' && $conf["mysql"]["host"] != $conf["mysql"]["master_host"]) {
- $conf['mysql']['master_slave_setup'] = 'y';
-}
-
-// Resolve the IP address of the mysql hostname.
-if(!$conf['mysql']['ip'] = gethostbyname($conf['mysql']['host'])) die('Unable to resolve hostname'.$conf['mysql']['host']);
-
-$conf['server_id'] = intval($conf_old["server_id"]);
-$conf['ispconfig_log_priority'] = $conf_old["log_priority"];
-
-$inst = new installer();
-$inst->is_update = true;
-
-//** Detect the installed applications
-$inst->find_installed_apps();
-
-echo "This application will update ISPConfig 3 on your server.\n";
-
-//** Initialize the MySQL server connection
-include_once('lib/mysql.lib.php');
-
-//** Database update is a bit brute force and should be rebuild later ;)
-
-/*
- * Try to read the DB-admin settings
- */
-$clientdb_host = '';
-$clientdb_user = '';
-$clientdb_password = '';
-include_once("/usr/local/ispconfig/server/lib/mysql_clientdb.conf");
-$conf["mysql"]["admin_user"] = $clientdb_user;
-$conf["mysql"]["admin_password"] = $clientdb_password;
-$clientdb_host = '';
-$clientdb_user = '';
-$clientdb_password = '';
-
-//** Ask user for mysql admin_password if empty
-if( empty($conf["mysql"]["admin_password"]) ) {
-
- $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
-}
-
-/*
- * Prepare the dump of the database
- */
-prepareDBDump();
-
-//* initialize the database
-$inst->db = new db();
-
-//* initialize the master DB, if we have a multiserver setup
-if($conf['mysql']['master_slave_setup'] == 'y') {
- //** Get MySQL root credentials
- $finished = false;
- do {
- $tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host']);
- $tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user']);
- $tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password']);
- $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database']);
-
- //* Initialize the MySQL server connection
- if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
- $conf['mysql']['master_host'] = $tmp_mysql_server_host;
- $conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
- $conf['mysql']['master_admin_password'] = $tmp_mysql_server_admin_password;
- $conf['mysql']['master_database'] = $tmp_mysql_server_database;
- $finished = true;
- } else {
- swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
- }
- } while ($finished == false);
- unset($finished);
-
- // initialize the connection to the master database
- $inst->dbmaster = new db();
- if($inst->dbmaster->linkId) $inst->dbmaster->closeConn();
- $inst->dbmaster->dbHost = $conf['mysql']["master_host"];
- $inst->dbmaster->dbName = $conf['mysql']["master_database"];
- $inst->dbmaster->dbUser = $conf['mysql']["master_admin_user"];
- $inst->dbmaster->dbPass = $conf['mysql']["master_admin_password"];
-} else {
- $inst->dbmaster = $inst->db;
-}
-
-
-/*
- * dump the new Database and reconfigure the server.ini
- */
-updateDbAndIni();
-
-/*
- * Reconfigure the permisson if needed
- * (if this is done at client side, only this client is updated.
- * If this is done at server side, all clients are updated.
- */
-//if($conf_old['dbmaster_user'] != '' or $conf_old['dbmaster_host'] != '') {
- //** Update master database rights
- $reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes','no'),'no');
-
- if($reconfigure_master_database_rights_answer == 'yes') {
- $inst->grant_master_database_rights();
- }
-//}
-
-//** Shall the services be reconfigured during update
-$reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes','no'),'yes');
-
-if($reconfigure_services_answer == 'yes') {
-
- if($conf['services']['mail']) {
- //** Configure postfix
- swriteln('Configuring Postfix');
- $inst->configure_postfix('dont-create-certs');
-
- //** Configure mailman
- swriteln('Configuring Mailman');
- $inst->configure_mailman('update');
-
- //* Configure Jailkit
- swriteln('Configuring Jailkit');
- $inst->configure_jailkit();
-
- if($conf['dovecot']['installed'] == true) {
- //* Configure dovecot
- swriteln('Configuring Dovecot');
- $inst->configure_dovecot();
- } else {
- //** Configure saslauthd
- swriteln('Configuring SASL');
- $inst->configure_saslauthd();
-
- //** Configure PAM
- swriteln('Configuring PAM');
- $inst->configure_pam();
-
- //* Configure courier
- swriteln('Configuring Courier');
- $inst->configure_courier();
- }
-
- //** Configure Spamasassin
- swriteln('Configuring Spamassassin');
- $inst->configure_spamassassin();
-
- //** Configure Amavis
- swriteln('Configuring Amavisd');
- $inst->configure_amavis();
-
- //** Configure Getmail
- swriteln('Configuring Getmail');
- $inst->configure_getmail();
- }
-
- if($conf['services']['web'] && $conf['pureftpd']['installed'] == true) {
- //** Configure Pureftpd
- swriteln('Configuring Pureftpd');
- $inst->configure_pureftpd();
- }
-
- if($conf['services']['dns']) {
- //* Configure DNS
- if($conf['powerdns']['installed'] == true) {
- swriteln('Configuring PowerDNS');
- $inst->configure_powerdns();
- } elseif($conf['bind']['installed'] == true) {
- swriteln('Configuring BIND');
- $inst->configure_bind();
- } else {
- swriteln('Configuring MyDNS');
- $inst->configure_mydns();
- }
- }
-
- if($conf['services']['web']) {
- //** Configure Apache
- swriteln('Configuring Apache');
- $inst->configure_apache();
-
- //** Configure vlogger
- swriteln('Configuring vlogger');
- $inst->configure_vlogger();
-
- //** Configure apps vhost
- swriteln('Configuring Apps vhost');
- $inst->configure_apps_vhost();
- }
-
-
- //* Configure DBServer
- swriteln('Configuring Database');
- $inst->configure_dbserver();
-
-
- if($conf['services']['firewall']) {
- if($conf['bastille']['installed'] == true) {
- //* Configure Bastille Firewall
- swriteln('Configuring Bastille Firewall');
- $inst->configure_firewall();
- } elseif($conf['ufw']['installed'] == true) {
- //* Configure Ubuntu Firewall
- swriteln('Configuring Ubuntu Firewall');
- $inst->configure_ufw_firewall();
- }
- }
-
- if($conf['squid']['installed'] == true) {
- swriteln('Configuring Squid');
- $inst->configure_squid();
- } else if($conf['nginx']['installed'] == true) {
- swriteln('Configuring Nginx');
- $inst->configure_nginx();
- }
-}
-
-//** Configure ISPConfig
-swriteln('Updating ISPConfig');
-
-
-if ($conf['services']['web'] && $inst->ispconfig_interface_installed) {
- //** Customise the port ISPConfig runs on
- $ispconfig_port_number = get_ispconfig_port_number();
- $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number);
-
- // $ispconfig_ssl_default = (is_ispconfig_ssl_enabled() == true)?'y':'n';
- if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate',array('yes','no'),'no')) == 'yes') {
- $inst->make_ispconfig_ssl_cert();
- }
-}
-
-$inst->install_ispconfig();
-
-//** Configure Crontab
-$update_crontab_answer = $inst->simple_query('Reconfigure Crontab?', array('yes','no'),'yes');
-if($update_crontab_answer == 'yes') {
- swriteln('Updating Crontab');
- $inst->install_crontab();
-}
-
-//** Restart services:
-if($reconfigure_services_answer == 'yes') {
- swriteln('Restarting services ...');
- if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script'])) system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
- if($conf['services']['mail']) {
- if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script'])) system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
- if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'])) system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
- if($conf['amavis']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['amavis']['init_script'])) system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
- if($conf['clamav']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['clamav']['init_script'])) system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
- if($conf['courier']['courier-authdaemon'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
- if($conf['courier']['courier-imap'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
- if($conf['courier']['courier-imap-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
- if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
- if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
- if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
- if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
- }
- if($conf['services']['web']) {
- if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
- if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'])) system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
- }
- if($conf['services']['dns']) {
- if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script'])) system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
- if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script'])) system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
- if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
- }
-
- if($conf['services']['proxy']) {
- if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
- if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
- }
-
- if($conf['services']['firewall']) {
- if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
- }
-}
-
-echo "Update finished.\n";
-
+<?php
+
+/*
+Copyright (c) 2007-2010, 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.
+*/
+
+/*
+ ISPConfig 3 updater.
+*/
+
+error_reporting(E_ALL|E_STRICT);
+
+//** The banner on the command line
+echo "\n\n".str_repeat('-',80)."\n";
+echo " _____ ___________ _____ __ _ ____
+|_ _/ ___| ___ \ / __ \ / _(_) /__ \
+ | | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _ _/ /
+ | | `--. \ __/ | | / _ \| '_ \| _| |/ _` | |_ |
+ _| |_/\__/ / | | \__/\ (_) | | | | | | | (_| | ___\ \
+ \___/\____/\_| \____/\___/|_| |_|_| |_|\__, | \____/
+ __/ |
+ |___/ ";
+echo "\n".str_repeat('-',80)."\n";
+echo "\n\n>> Update \n\n";
+
+//** Include the library with the basic installer functions
+require_once('lib/install.lib.php');
+
+//** Include the library with the basic updater functions
+require_once('lib/update.lib.php');
+
+//** Include the base class of the installer class
+require_once('lib/installer_base.lib.php');
+
+//** Ensure that current working directory is install directory
+$cur_dir = getcwd();
+if(realpath(dirname(__FILE__)) != $cur_dir) die("Please run installation/update from _inside_ the install directory!\n");
+
+//** Install logfile
+define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
+define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
+
+//** Check for ISPConfig 2.x versions
+if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
+ die('This software cannot be installed on a server wich runs ISPConfig 2.x.');
+}
+
+//** Get distribution identifier
+$dist = get_distname();
+
+include_once("/usr/local/ispconfig/server/lib/config.inc.php");
+$conf_old = $conf;
+unset($conf);
+
+if($dist['id'] == '') die('Linux distribution or version not recognized.');
+
+//** Include the distribution-specific installer class library and configuration
+if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
+include_once('dist/lib/'.$dist['id'].'.lib.php');
+include_once('dist/conf/'.$dist['id'].'.conf.php');
+
+//** Get hostname
+exec('hostname -f', $tmp_out);
+$conf['hostname'] = $tmp_out[0];
+unset($tmp_out);
+
+//** Set the mysql login information
+$conf["mysql"]["host"] = $conf_old["db_host"];
+$conf["mysql"]["database"] = $conf_old["db_database"];
+$conf['mysql']['charset'] = 'utf8';
+$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
+$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
+$conf['language'] = $conf_old['language'];
+if($conf['language'] == '{language}') $conf['language'] = 'en';
+
+if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
+if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];
+if(isset($conf_old["dbmaster_user"])) $conf["mysql"]["master_ispconfig_user"] = $conf_old["dbmaster_user"];
+if(isset($conf_old["dbmaster_password"])) $conf["mysql"]["master_ispconfig_password"] = $conf_old["dbmaster_password"];
+
+//* Check if this is a master / slave setup
+if($conf["mysql"]["master_host"] != '' && $conf["mysql"]["host"] != $conf["mysql"]["master_host"]) {
+ $conf['mysql']['master_slave_setup'] = 'y';
+}
+
+// Resolve the IP address of the mysql hostname.
+if(!$conf['mysql']['ip'] = gethostbyname($conf['mysql']['host'])) die('Unable to resolve hostname'.$conf['mysql']['host']);
+
+$conf['server_id'] = intval($conf_old["server_id"]);
+$conf['ispconfig_log_priority'] = $conf_old["log_priority"];
+
+$inst = new installer();
+$inst->is_update = true;
+
+//** Detect the installed applications
+$inst->find_installed_apps();
+
+echo "This application will update ISPConfig 3 on your server.\n";
+
+//** Initialize the MySQL server connection
+include_once('lib/mysql.lib.php');
+
+//** Database update is a bit brute force and should be rebuild later ;)
+
+/*
+ * Try to read the DB-admin settings
+ */
+$clientdb_host = '';
+$clientdb_user = '';
+$clientdb_password = '';
+include_once("/usr/local/ispconfig/server/lib/mysql_clientdb.conf");
+$conf["mysql"]["admin_user"] = $clientdb_user;
+$conf["mysql"]["admin_password"] = $clientdb_password;
+$clientdb_host = '';
+$clientdb_user = '';
+$clientdb_password = '';
+
+//** Ask user for mysql admin_password if empty
+if( empty($conf["mysql"]["admin_password"]) ) {
+
+ $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
+}
+
+/*
+ * Prepare the dump of the database
+ */
+prepareDBDump();
+
+//* initialize the database
+$inst->db = new db();
+
+//* initialize the master DB, if we have a multiserver setup
+if($conf['mysql']['master_slave_setup'] == 'y') {
+ //** Get MySQL root credentials
+ $finished = false;
+ do {
+ $tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host']);
+ $tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user']);
+ $tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password']);
+ $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database']);
+
+ //* Initialize the MySQL server connection
+ if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
+ $conf['mysql']['master_host'] = $tmp_mysql_server_host;
+ $conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
+ $conf['mysql']['master_admin_password'] = $tmp_mysql_server_admin_password;
+ $conf['mysql']['master_database'] = $tmp_mysql_server_database;
+ $finished = true;
+ } else {
+ swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
+ }
+ } while ($finished == false);
+ unset($finished);
+
+ // initialize the connection to the master database
+ $inst->dbmaster = new db();
+ if($inst->dbmaster->linkId) $inst->dbmaster->closeConn();
+ $inst->dbmaster->dbHost = $conf['mysql']["master_host"];
+ $inst->dbmaster->dbName = $conf['mysql']["master_database"];
+ $inst->dbmaster->dbUser = $conf['mysql']["master_admin_user"];
+ $inst->dbmaster->dbPass = $conf['mysql']["master_admin_password"];
+} else {
+ $inst->dbmaster = $inst->db;
+}
+
+/*
+ * Check all tables
+*/
+checkDbHealth();
+
+/*
+ * dump the new Database and reconfigure the server.ini
+ */
+updateDbAndIni();
+
+/*
+ * Reconfigure the permisson if needed
+ * (if this is done at client side, only this client is updated.
+ * If this is done at server side, all clients are updated.
+ */
+//if($conf_old['dbmaster_user'] != '' or $conf_old['dbmaster_host'] != '') {
+ //** Update master database rights
+ $reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes','no'),'no');
+
+ if($reconfigure_master_database_rights_answer == 'yes') {
+ $inst->grant_master_database_rights();
+ }
+//}
+
+//** Shall the services be reconfigured during update
+$reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes','no'),'yes');
+
+if($reconfigure_services_answer == 'yes') {
+
+ if($conf['services']['mail']) {
+ //** Configure postfix
+ swriteln('Configuring Postfix');
+ $inst->configure_postfix('dont-create-certs');
+
+ //** Configure mailman
+ swriteln('Configuring Mailman');
+ $inst->configure_mailman('update');
+
+ //* Configure Jailkit
+ swriteln('Configuring Jailkit');
+ $inst->configure_jailkit();
+
+ if($conf['dovecot']['installed'] == true) {
+ //* Configure dovecot
+ swriteln('Configuring Dovecot');
+ $inst->configure_dovecot();
+ } else {
+ //** Configure saslauthd
+ swriteln('Configuring SASL');
+ $inst->configure_saslauthd();
+
+ //** Configure PAM
+ swriteln('Configuring PAM');
+ $inst->configure_pam();
+
+ //* Configure courier
+ swriteln('Configuring Courier');
+ $inst->configure_courier();
+ }
+
+ //** Configure Spamasassin
+ swriteln('Configuring Spamassassin');
+ $inst->configure_spamassassin();
+
+ //** Configure Amavis
+ swriteln('Configuring Amavisd');
+ $inst->configure_amavis();
+
+ //** Configure Getmail
+ swriteln('Configuring Getmail');
+ $inst->configure_getmail();
+ }
+
+ if($conf['services']['web'] && $conf['pureftpd']['installed'] == true) {
+ //** Configure Pureftpd
+ swriteln('Configuring Pureftpd');
+ $inst->configure_pureftpd();
+ }
+
+ if($conf['services']['dns']) {
+ //* Configure DNS
+ if($conf['powerdns']['installed'] == true) {
+ swriteln('Configuring PowerDNS');
+ $inst->configure_powerdns();
+ } elseif($conf['bind']['installed'] == true) {
+ swriteln('Configuring BIND');
+ $inst->configure_bind();
+ } else {
+ swriteln('Configuring MyDNS');
+ $inst->configure_mydns();
+ }
+ }
+
+ if($conf['services']['web']) {
+ //** Configure Apache
+ swriteln('Configuring Apache');
+ $inst->configure_apache();
+
+ //** Configure vlogger
+ swriteln('Configuring vlogger');
+ $inst->configure_vlogger();
+
+ //** Configure apps vhost
+ swriteln('Configuring Apps vhost');
+ $inst->configure_apps_vhost();
+ }
+
+
+ //* Configure DBServer
+ swriteln('Configuring Database');
+ $inst->configure_dbserver();
+
+
+ if($conf['services']['firewall']) {
+ if($conf['bastille']['installed'] == true) {
+ //* Configure Bastille Firewall
+ swriteln('Configuring Bastille Firewall');
+ $inst->configure_firewall();
+ } elseif($conf['ufw']['installed'] == true) {
+ //* Configure Ubuntu Firewall
+ swriteln('Configuring Ubuntu Firewall');
+ $inst->configure_ufw_firewall();
+ }
+ }
+
+ if($conf['squid']['installed'] == true) {
+ swriteln('Configuring Squid');
+ $inst->configure_squid();
+ } else if($conf['nginx']['installed'] == true) {
+ swriteln('Configuring Nginx');
+ $inst->configure_nginx();
+ }
+}
+
+//** Configure ISPConfig
+swriteln('Updating ISPConfig');
+
+
+if ($conf['services']['web'] && $inst->ispconfig_interface_installed) {
+ //** Customise the port ISPConfig runs on
+ $ispconfig_port_number = get_ispconfig_port_number();
+ $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number);
+
+ // $ispconfig_ssl_default = (is_ispconfig_ssl_enabled() == true)?'y':'n';
+ if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate',array('yes','no'),'no')) == 'yes') {
+ $inst->make_ispconfig_ssl_cert();
+ }
+}
+
+$inst->install_ispconfig();
+
+//** Configure Crontab
+$update_crontab_answer = $inst->simple_query('Reconfigure Crontab?', array('yes','no'),'yes');
+if($update_crontab_answer == 'yes') {
+ swriteln('Updating Crontab');
+ $inst->install_crontab();
+}
+
+//** Restart services:
+if($reconfigure_services_answer == 'yes') {
+ swriteln('Restarting services ...');
+ if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script'])) system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
+ if($conf['services']['mail']) {
+ if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script'])) system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
+ if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'])) system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
+ if($conf['amavis']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['amavis']['init_script'])) system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
+ if($conf['clamav']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['clamav']['init_script'])) system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
+ if($conf['courier']['courier-authdaemon'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
+ if($conf['courier']['courier-imap'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
+ if($conf['courier']['courier-imap-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
+ if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
+ if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
+ if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
+ if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
+ }
+ if($conf['services']['web']) {
+ if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
+ if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'])) system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
+ }
+ if($conf['services']['dns']) {
+ if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script'])) system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
+ if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script'])) system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
+ if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
+ }
+
+ if($conf['services']['proxy']) {
+ if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
+ if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
+ }
+
+ if($conf['services']['firewall']) {
+ if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
+ }
+}
+
+echo "Update finished.\n";
+
?>
\ No newline at end of file
--
Gitblit v1.9.1