From ebd0e986ed11f2a34fb58cdd33efbfab192083ad Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 22 Apr 2016 05:26:17 -0400
Subject: [PATCH] Added PHP 7 check in installer and updater.
---
install/update.php | 118 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 74 insertions(+), 44 deletions(-)
diff --git a/install/update.php b/install/update.php
index 1862ef2..a620c32 100644
--- a/install/update.php
+++ b/install/update.php
@@ -30,6 +30,30 @@
/*
ISPConfig 3 updater.
+
+ -------------------------------------------------------------------------------------
+ - Interactive update
+ -------------------------------------------------------------------------------------
+ run:
+
+ php update.php
+
+ -------------------------------------------------------------------------------------
+ - Noninteractive (autoupdate) mode
+ -------------------------------------------------------------------------------------
+
+ The autoupdate mode can read the updater questions from a .ini style file or from
+ a php config file. Examples for both file types are in the docs folder.
+ See autoinstall.ini.sample and autoinstall.conf_sample.php.
+
+ run:
+
+ php update.php --autoinstall=autoinstall.ini
+
+ or
+
+ php update.php --autoinstall=autoinstall.conf.php
+
*/
error_reporting(E_ALL|E_STRICT);
@@ -83,9 +107,37 @@
if($dist['id'] == '') die('Linux distribution or version not recognized.');
+//** Check the PHP Version
+if (version_compare(PHP_VERSION, '7.0.0') >= 0) {
+ die('PHP 7 is not supported by ISPConfig 3.0.5. Plesae use ISPConfig version 3.1 instead.');
+}
+
//** Include the autoinstaller configuration (for non-interactive setups)
error_reporting(E_ALL ^ E_NOTICE);
-if(is_file('autoinstall.conf.php')) include_once 'autoinstall.conf.php';
+
+//** Get commandline options
+$cmd_opt = getopt('', array('autoinstall::'));
+
+//** Load autoinstall file
+if(isset($cmd_opt['autoinstall']) && is_file($cmd_opt['autoinstall'])) {
+ $path_parts = pathinfo($cmd_opt['autoinstall']);
+ if($path_parts['extension'] == 'php') {
+ include_once $cmd_opt['autoinstall'];
+ } elseif($path_parts['extension'] == 'ini') {
+ $tmp = ini_to_array(file_get_contents('autoinstall.ini'));
+ if(!is_array($tmp['install'])) $tmp['install'] = array();
+ if(!is_array($tmp['ssl_cert'])) $tmp['ssl_cert'] = array();
+ if(!is_array($tmp['expert'])) $tmp['expert'] = array();
+ if(!is_array($tmp['update'])) $tmp['update'] = array();
+ $autoinstall = $tmp['install'] + $tmp['ssl_cert'] + $tmp['expert'] + $tmp['update'];
+ unset($tmp);
+ }
+ unset($path_parts);
+ define('AUTOINSTALL', true);
+} else {
+ $autoinstall = array();
+ define('AUTOINSTALL', false);
+}
//** 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';
@@ -135,12 +187,7 @@
echo "This application will update ISPConfig 3 on your server.\n\n";
//* Make a backup before we start the update
-if($autoupdate['do_backup'] == 'default') $autoupdate['do_backup'] = 'yes';
-if($autoupdate['do_backup'] == 'yes' || $autoupdate['do_backup'] == 'no'){
- $do_backup = $autoupdate['do_backup'];
-} else {
- $do_backup = $inst->simple_query('Shall the script create a ISPConfig backup in /var/backup/ now?', array('yes', 'no'), 'yes');
-}
+$do_backup = $inst->simple_query('Shall the script create a ISPConfig backup in /var/backup/ now?', array('yes', 'no'), 'yes','do_backup');
if($do_backup == 'yes') {
@@ -190,7 +237,7 @@
$finished = true;
} else {
swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
- $conf["mysql"]["admin_password"] = (isset($autoupdate['mysql_root_password'])? $autoupdate['mysql_root_password'] : $inst->free_query('MySQL root password', $conf['mysql']['admin_password']));
+ $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password'],'mysql_root_password');
}
} while ($finished == false);
unset($finished);
@@ -208,12 +255,10 @@
//** Get MySQL root credentials
$finished = false;
do {
- if($autoupdate['mysql_master_database'] == 'default') $autoupdate['mysql_master_database'] = $conf['mysql']['master_database'];
-
- $tmp_mysql_server_host = ($autoupdate['mysql_master_hostname'] != ''? $autoupdate['mysql_master_hostname'] : $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host']));
- $tmp_mysql_server_admin_user = ($autoupdate['mysql_master_root_user'] != ''? $autoupdate['mysql_master_root_user'] : $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user']));
- $tmp_mysql_server_admin_password = (isset($autoupdate['mysql_master_root_password'])? $autoupdate['mysql_master_root_password'] : $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password']));
- $tmp_mysql_server_database = ($autoupdate['mysql_master_database'] != ''? $autoupdate['mysql_master_database'] : $inst->free_query('MySQL master server database name', $conf['mysql']['master_database']));
+ $tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host'],'mysql_master_hostname');
+ $tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user'],'mysql_master_root_user');
+ $tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password'],'mysql_master_root_password');
+ $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'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)) {
@@ -256,12 +301,7 @@
*/
//if($conf_old['dbmaster_user'] != '' or $conf_old['dbmaster_host'] != '') {
//** Update master database rights
-if($autoupdate['reconfigure_permissions_in_master_database'] == 'default') $autoupdate['reconfigure_permissions_in_master_database'] = 'no';
-if($autoupdate['reconfigure_permissions_in_master_database'] == 'no' || $autoupdate['reconfigure_permissions_in_master_database'] == 'yes'){
- $reconfigure_master_database_rights_answer = $autoupdate['reconfigure_permissions_in_master_database'];
-} else {
- $reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes', 'no'), 'no');
-}
+$reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes', 'no'), 'no','reconfigure_permissions_in_master_database');
if($reconfigure_master_database_rights_answer == 'yes') {
$inst->grant_master_database_rights();
@@ -269,12 +309,7 @@
//}
//** Shall the services be reconfigured during update
-if($autoupdate['reconfigure_services'] == 'default') $autoupdate['reconfigure_services'] = 'yes';
-if($autoupdate['reconfigure_services'] == 'yes' || $autoupdate['reconfigure_services'] == 'no'){
- $reconfigure_services_answer = $autoupdate['reconfigure_services'];
-} else {
- $reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes', 'no'), 'yes');
-}
+$reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes', 'no'), 'yes','reconfigure_services');
if($reconfigure_services_answer == 'yes') {
@@ -403,35 +438,25 @@
$ispconfig_port_number = get_ispconfig_port_number();
if($autoupdate['ispconfig_port'] == 'default') $autoupdate['ispconfig_port'] = $ispconfig_port_number;
if($conf['webserver']['server_type'] == 'nginx'){
- $conf['nginx']['vhost_port'] = (intval($autoupdate['ispconfig_port']) > 0 ? intval($autoupdate['ispconfig_port']) : $inst->free_query('ISPConfig Port', $ispconfig_port_number));
+ $conf['nginx']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number,'ispconfig_port');
} else {
- $conf['apache']['vhost_port'] = (intval($autoupdate['ispconfig_port']) > 0 ? intval($autoupdate['ispconfig_port']) : $inst->free_query('ISPConfig Port', $ispconfig_port_number));
+ $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number,'ispconfig_port');
}
// $ispconfig_ssl_default = (is_ispconfig_ssl_enabled() == true)?'y':'n';
- $tmp_create_new_ispconfig_ssl_cert = 'no';
- if($autoupdate['create_new_ispconfig_ssl_cert'] == 'default') $autoupdate['create_new_ispconfig_ssl_cert'] = 'no';
- if($autoupdate['create_new_ispconfig_ssl_cert'] == 'no' || $autoupdate['create_new_ispconfig_ssl_cert'] == 'yes'){
- $tmp_create_new_ispconfig_ssl_cert = $autoupdate['create_new_ispconfig_ssl_cert'];
- } else {
- $tmp_create_new_ispconfig_ssl_cert = strtolower($inst->simple_query('Create new ISPConfig SSL certificate', array('yes', 'no'), 'no'));
- }
- if($tmp_create_new_ispconfig_ssl_cert == 'yes') {
+ if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate', array('yes', 'no'), 'no','create_new_ispconfig_ssl_cert')) == 'yes') {
$inst->make_ispconfig_ssl_cert();
}
}
$inst->install_ispconfig();
-//** Configure Crontab
-if($autoupdate['reconfigure_crontab'] == 'default') $autoupdate['reconfigure_crontab'] = 'yes';
-if($autoupdate['reconfigure_crontab'] == 'no' || $autoupdate['reconfigure_crontab'] == 'yes'){
- $update_crontab_answer = $autoupdate['reconfigure_crontab'];
-} else {
- $update_crontab_answer = $inst->simple_query('Reconfigure Crontab?', array('yes', 'no'), 'yes');
-}
+// Cleanup
+$inst->cleanup_ispconfig();
+//** Configure Crontab
+$update_crontab_answer = $inst->simple_query('Reconfigure Crontab?', array('yes', 'no'), 'yes','reconfigure_crontab');
if($update_crontab_answer == 'yes') {
swriteln('Updating Crontab');
$inst->install_crontab();
@@ -440,7 +465,7 @@
//** Restart services:
if($reconfigure_services_answer == 'yes') {
swriteln('Restarting services ...');
- if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart'));
+ if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart').' >/dev/null 2>&1');
if($conf['services']['mail']) {
if($conf['postfix']['installed'] == true && $conf['postfix']['init_script'] != '') system($inst->getinitcommand($conf['postfix']['init_script'], 'restart'));
if($conf['saslauthd']['installed'] == true && $conf['saslauthd']['init_script'] != '') system($inst->getinitcommand($conf['saslauthd']['init_script'], 'restart'));
@@ -481,6 +506,11 @@
}
}
+//* Create md5 filelist
+$md5_filename = '/usr/local/ispconfig/security/data/file_checksums_'.date('Y-m-d_h-i').'.md5';
+exec('find /usr/local/ispconfig -type f -print0 | xargs -0 md5sum > '.$md5_filename);
+chmod($md5_filename,0700);
+
echo "Update finished.\n";
?>
--
Gitblit v1.9.1