From bcd725da57d20004a30e6934d5bc9669241461e4 Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Tue, 27 May 2014 13:08:59 -0400
Subject: [PATCH] - Implemented non-interactive install/update mode.
---
install/install.php | 172 ++++++++++++++++++++++++++++------
install/lib/installer_base.lib.php | 15 ++
install/update.php | 60 +++++++++--
install/autoinstall.conf_sample.php | 44 ++++++++
4 files changed, 245 insertions(+), 46 deletions(-)
diff --git a/install/autoinstall.conf_sample.php b/install/autoinstall.conf_sample.php
new file mode 100644
index 0000000..92ec008
--- /dev/null
+++ b/install/autoinstall.conf_sample.php
@@ -0,0 +1,44 @@
+<?php
+$autoinstall['language'] = 'en'; // de, en (default)
+$autoinstall['install_mode'] = 'standard'; // standard (default), expert
+
+$autoinstall['hostname'] = 'server1.example.com'; // default
+$autoinstall['mysql_hostname'] = 'localhost'; // default: localhost
+$autoinstall['mysql_root_user'] = 'root'; // default: root
+$autoinstall['mysql_root_password'] = 'howtoforge';
+$autoinstall['mysql_database'] = 'dbispconfig'; // default: dbispcongig
+$autoinstall['mysql_charset'] = 'utf8'; // default: utf8
+$autoinstall['http_server'] = 'nginx'; // apache (default), nginx
+$autoinstall['ispconfig_port'] = '8080'; // default: 8080
+$autoinstall['ispconfig_use_ssl'] = 'y'; // y (default), n
+
+/* optional expert mode settings, needed only for expert mode */
+$autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig
+$autoinstall['mysql_ispconfig_password'] = md5(uniqid(rand()));
+$autoinstall['join_multiserver_setup'] = 'n'; // y, n (default)
+$autoinstall['mysql_master_hostname'] = 'master.example.com';
+$autoinstall['mysql_master_root_user'] = 'root';
+$autoinstall['mysql_master_root_password'] = 'howtoforge';
+$autoinstall['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
+$autoinstall['configure_mail'] = 'y'; // y (default), n
+$autoinstall['configure_jailkit'] = 'y'; // y (default), n
+$autoinstall['configure_ftp'] = 'y'; // y (default), n
+$autoinstall['configure_dns'] = 'y'; // y (default), n
+$autoinstall['configure_apache'] = 'y'; // y (default), n
+$autoinstall['configure_nginx'] = 'y'; // y (default), n
+$autoinstall['configure_firewall'] = 'y'; // y (default), n
+$autoinstall['install_ispconfig_web_interface'] = 'y'; // y (default), n
+
+/* optional update settings, needed only for updates */
+$autoupdate['do_backup'] = 'yes'; // yes (default), no
+$autoupdate['mysql_root_password'] = 'howtoforge';
+$autoupdate['mysql_master_hostname'] = 'master.example.com';
+$autoupdate['mysql_master_root_user'] = 'root';
+$autoupdate['mysql_master_root_password'] = 'howtoforge';
+$autoupdate['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
+$autoupdate['reconfigure_permissions_in_master_database'] = 'no'; // no (default), yes
+$autoupdate['reconfigure_services'] = 'yes'; // yes (default), no
+$autoupdate['ispconfig_port'] = '8080'; // default: 8080
+$autoupdate['create_new_ispconfig_ssl_cert'] = 'no'; // no (default), yes
+$autoupdate['reconfigure_crontab'] = 'yes'; // yes (default), no
+?>
\ No newline at end of file
diff --git a/install/install.php b/install/install.php
index 796b027..838209e 100644
--- a/install/install.php
+++ b/install/install.php
@@ -78,6 +78,10 @@
if($dist['id'] == '') die('Linux distribution or version not recognized.');
+//** 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';
+
//** 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';
@@ -109,7 +113,12 @@
$inst->find_installed_apps();
//** Select the language and set default timezone
-$conf['language'] = $inst->simple_query('Select language', array('en', 'de'), 'en');
+if($autoinstall['language'] == 'default') $autoinstall['language'] = 'en';
+if($autoinstall['language'] == 'en' || $autoinstall['language'] == 'de'){
+ $conf['language'] = $autoinstall['language'];
+} else {
+ $conf['language'] = $inst->simple_query('Select language', array('en', 'de'), 'en');
+}
$conf['timezone'] = get_system_timezone();
//* Set default theme
@@ -117,13 +126,19 @@
$conf['language_file_import_enabled'] = true;
//** Select installation mode
-$install_mode = $inst->simple_query('Installation mode', array('standard', 'expert'), 'standard');
+if($autoinstall['install_mode'] == 'default') $autoinstall['install_mode'] = 'standard';
+if($autoinstall['install_mode'] == 'standard' || $autoinstall['install_mode'] == 'expert'){
+ $install_mode = $autoinstall['install_mode'];
+} else {
+ $install_mode = $inst->simple_query('Installation mode', array('standard', 'expert'), 'standard');
+}
//** Get the hostname
$tmp_out = array();
exec('hostname -f', $tmp_out);
-$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', @$tmp_out[0]);
+if($autoinstall['hostname'] == 'default') $autoinstall['hostname'] = @$tmp_out[0];
+$conf['hostname'] = ($autoinstall['hostname'] != '' ? $autoinstall['hostname'] : $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', @$tmp_out[0]));
unset($tmp_out);
// Check if the mysql functions are loaded in PHP
@@ -132,16 +147,24 @@
//** Get MySQL root credentials
$finished = false;
do {
- $tmp_mysql_server_host = $inst->free_query('MySQL server hostname', $conf['mysql']['host']);
- $tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user']);
- $tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
- $tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']);
- $tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset']);
+ if($autoinstall['mysql_hostname'] == 'default') $autoinstall['mysql_hostname'] = $conf['mysql']['host'];
+ if($autoinstall['mysql_root_user'] == 'default') $autoinstall['mysql_root_user'] = $conf['mysql']['admin_user'];
+ if($autoinstall['mysql_database'] == 'default') $autoinstall['mysql_database'] = $conf['mysql']['database'];
+ if($autoinstall['mysql_charset'] == 'default') $autoinstall['mysql_charset'] = $conf['mysql']['charset'];
+
+ $tmp_mysql_server_host = ($autoinstall['mysql_hostname'] != ''? $autoinstall['mysql_hostname'] : $inst->free_query('MySQL server hostname', $conf['mysql']['host']));
+ $tmp_mysql_server_admin_user = ($autoinstall['mysql_root_user'] != ''? $autoinstall['mysql_root_user'] : $inst->free_query('MySQL root username', $conf['mysql']['admin_user']));
+ $tmp_mysql_server_admin_password = (isset($autoinstall['mysql_root_password'])? $autoinstall['mysql_root_password'] : $inst->free_query('MySQL root password', $conf['mysql']['admin_password']));
+ $tmp_mysql_server_database = ($autoinstall['mysql_database'] != ''? $autoinstall['mysql_database'] : $inst->free_query('MySQL database to create', $conf['mysql']['database']));
+ $tmp_mysql_server_charset = ($autoinstall['mysql_charset'] != ''? $autoinstall['mysql_charset'] : $inst->free_query('MySQL charset', $conf['mysql']['charset']));
if($install_mode == 'expert') {
swriteln("The next two questions are about the internal ISPConfig database user and password.\nIt is recommended to accept the defaults which are 'ispconfig' as username and a random password.\nIf you use a different password, use only numbers and chars for the password.\n");
- $conf['mysql']['ispconfig_user'] = $inst->free_query('ISPConfig mysql database username', $conf['mysql']['ispconfig_user']);
- $conf['mysql']['ispconfig_password'] = $inst->free_query('ISPConfig mysql database password', $conf['mysql']['ispconfig_password']);
+
+ if($autoinstall['mysql_ispconfig_user'] == 'default') $autoinstall['mysql_ispconfig_user'] = $conf['mysql']['ispconfig_user'];
+
+ $conf['mysql']['ispconfig_user'] = ($autoinstall['mysql_ispconfig_user'] != ''? $autoinstall['mysql_ispconfig_user'] : $inst->free_query('ISPConfig mysql database username', $conf['mysql']['ispconfig_user']));
+ $conf['mysql']['ispconfig_password'] = (isset($autoinstall['mysql_ispconfig_password'])? $autoinstall['mysql_ispconfig_password'] : $inst->free_query('ISPConfig mysql database password', $conf['mysql']['ispconfig_password']));
}
//* Initialize the MySQL server connection
@@ -176,7 +199,12 @@
//* Configure Webserver - Apache or nginx
if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
- $http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache');
+ if($autoinstall['http_server'] == 'default') $autoinstall['http_server'] = 'apache';
+ if($autoinstall['http_server'] == 'apache' || $autoinstall['http_server'] == 'nginx'){
+ $http_server_to_use = $autoinstall['http_server'];
+ } else {
+ $http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache');
+ }
if($http_server_to_use == 'apache'){
$conf['nginx']['installed'] = false;
} else {
@@ -293,13 +321,19 @@
swriteln('Installing ISPConfig');
//** Customize the port ISPConfig runs on
- $ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080');
+ if($autoinstall['isspconfig_port'] == 'default') $autoinstall['ispconfig_port'] = '8080';
+ $ispconfig_vhost_port = (intval($autoinstall['ispconfig_port']) > 0 ? intval($autoinstall['ispconfig_port']) : $inst->free_query('ISPConfig Port', '8080'));
if($conf['apache']['installed'] == true) $conf['apache']['vhost_port'] = $ispconfig_vhost_port;
if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port'] = $ispconfig_vhost_port;
unset($ispconfig_vhost_port);
- if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface', array('y', 'n'), 'y')) == 'y') {
- $inst->make_ispconfig_ssl_cert();
+ if($autoinstall['ispconfig_use_ssl'] == 'default') $autoinstall['ispconfig_use_ssl'] = 'y';
+ if($autoinstall['ispconfig_use_ssl'] == 'y' || $autoinstall['ispconfig_use_ssl'] == 'n'){
+ if($autoinstall['ispconfig_use_ssl'] == 'y') $inst->make_ispconfig_ssl_cert();
+ } else {
+ if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface', array('y', 'n'), 'y')) == 'y') {
+ $inst->make_ispconfig_ssl_cert();
+ }
}
$inst->install_ispconfig();
@@ -354,17 +388,26 @@
//** Get Server ID
// $conf['server_id'] = $inst->free_query('Unique Numeric ID of the server','1');
// Server ID is an autoInc value of the mysql database now
+ $tmp_join_multiserver_setup = 'n';
+ if($autoinstall['join_multiserver_setup'] == 'default') $autoinstall['join_multiserver_setup'] = 'n';
+ if($autoinstall['join_multiserver_setup'] == 'y' || $autoinstall['join_multiserver_setup'] == 'n'){
+ $tmp_join_multiserver_setup = $autoinstall['join_multiserver_setup'];
+ } else {
+ $tmp_join_multiserver_setup = strtolower($inst->simple_query('Shall this server join an existing ISPConfig multiserver setup', array('y', 'n'), 'n'));
+ }
- if(strtolower($inst->simple_query('Shall this server join an existing ISPConfig multiserver setup', array('y', 'n'), 'n')) == 'y') {
+ if($tmp_join_multiserver_setup == 'y') {
$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']);
+ if($autoinstall['mysql_master_database'] == 'default') $autoinstall['mysql_master_database'] = $conf['mysql']['master_database'];
+
+ $tmp_mysql_server_host = ($autoinstall['mysql_master_hostname'] != ''? $autoinstall['mysql_master_hostname'] : $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host']));
+ $tmp_mysql_server_admin_user = ($autoinstall['mysql_master_root_user'] != ''? $autoinstall['mysql_master_root_user'] : $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user']));
+ $tmp_mysql_server_admin_password = (isset($autoinstall['mysql_master_root_password'])? $autoinstall['mysql_master_root_password'] : $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password']));
+ $tmp_mysql_server_database = ($autoinstall['mysql_master_database'] != ''? $autoinstall['mysql_master_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)) {
@@ -397,7 +440,12 @@
//* Configure Webserver - Apache or nginx
if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
- $http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache');
+ if($autoinstall['http_server'] == 'default') $autoinstall['http_server'] = 'apache';
+ if($autoinstall['http_server'] == 'apache' || $autoinstall['http_server'] == 'nginx'){
+ $http_server_to_use = $autoinstall['http_server'];
+ } else {
+ $http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache');
+ }
if($http_server_to_use == 'apache'){
$conf['nginx']['installed'] = false;
} else {
@@ -410,8 +458,15 @@
swriteln('');
$inst->add_database_server_record();
+ $tmp_configure_mail = 'y';
+ if($autoinstall['configure_mail'] == 'default') $autoinstall['configure_mail'] = 'y';
+ if($autoinstall['configure_mail'] == 'y' || $autoinstall['configure_mail'] == 'n'){
+ $tmp_configure_mail = $autoinstall['configure_mail'];
+ } else {
+ $tmp_configure_mail = strtolower($inst->simple_query('Configure Mail', array('y', 'n') , 'y'));
+ }
- if(strtolower($inst->simple_query('Configure Mail', array('y', 'n') , 'y') ) == 'y') {
+ if($tmp_configure_mail == 'y') {
$conf['services']['mail'] = true;
@@ -470,20 +525,41 @@
}
//** Configure Jailkit
- if(strtolower($inst->simple_query('Configure Jailkit', array('y', 'n'), 'y') ) == 'y') {
+ $tmp_configure_jailkit = 'y';
+ if($autoinstall['configure_jailkit'] == 'default') $autoinstall['configure_jailkit'] = 'y';
+ if($autoinstall['configure_jailkit'] == 'y' || $autoinstall['configure_jailkit'] == 'n'){
+ $tmp_configure_jailkit = $autoinstall['configure_jailkit'];
+ } else {
+ $tmp_configure_jailkit = strtolower($inst->simple_query('Configure Jailkit', array('y', 'n'), 'y'));
+ }
+ if($tmp_configure_jailkit == 'y') {
swriteln('Configuring Jailkit');
$inst->configure_jailkit();
}
//** Configure Pureftpd
- if(strtolower($inst->simple_query('Configure FTP Server', array('y', 'n'), 'y') ) == 'y') {
+ $tmp_configure_ftp = 'y';
+ if($autoinstall['configure_ftp'] == 'default') $autoinstall['configure_ftp'] = 'y';
+ if($autoinstall['configure_ftp'] == 'y' || $autoinstall['configure_ftp'] == 'n'){
+ $tmp_configure_ftp = $autoinstall['configure_ftp'];
+ } else {
+ $tmp_configure_ftp = strtolower($inst->simple_query('Configure FTP Server', array('y', 'n'), 'y'));
+ }
+ if($tmp_configure_ftp == 'y') {
swriteln('Configuring Pureftpd');
$inst->configure_pureftpd();
if($conf['pureftpd']['installed'] == true && $conf['pureftpd']['init_script'] != '') system($inst->getinitcommand($conf['pureftpd']['init_script'], 'restart'));
}
//** Configure DNS
- if(strtolower($inst->simple_query('Configure DNS Server', array('y', 'n'), 'y')) == 'y') {
+ $tmp_configure_dns = 'y';
+ if($autoinstall['configure_dns'] == 'default') $autoinstall['configure_dns'] = 'y';
+ if($autoinstall['configure_dns'] == 'y' || $autoinstall['configure_dns'] == 'n'){
+ $tmp_configure_dns = $autoinstall['configure_dns'];
+ } else {
+ $tmp_configure_dns = strtolower($inst->simple_query('Configure DNS Server', array('y', 'n'), 'y'));
+ }
+ if($tmp_configure_dns == 'y') {
$conf['services']['dns'] = true;
//* Configure DNS
if($conf['powerdns']['installed'] == true) {
@@ -522,7 +598,14 @@
//** Configure Apache
if($conf['apache']['installed'] == true){
swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure Apache Server' option.\n");
- if(strtolower($inst->simple_query('Configure Apache Server', array('y', 'n'), 'y')) == 'y') {
+ $tmp_configure_apache = 'y';
+ if($autoinstall['configure_apache'] == 'default') $autoinstall['configure_apache'] = 'y';
+ if($autoinstall['configure_apache'] == 'y' || $autoinstall['configure_apache'] == 'n'){
+ $tmp_configure_apache = $autoinstall['configure_apache'];
+ } else {
+ $tmp_configure_apache = strtolower($inst->simple_query('Configure Apache Server', array('y', 'n'), 'y'));
+ }
+ if($tmp_configure_apache == 'y') {
$conf['services']['web'] = true;
swriteln('Configuring Apache');
$inst->configure_apache();
@@ -540,7 +623,14 @@
//** Configure nginx
if($conf['nginx']['installed'] == true){
swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure nginx Server' option.\n");
- if(strtolower($inst->simple_query('Configure nginx Server', array('y', 'n'), 'y')) == 'y') {
+ $tmp_configure_nginx = 'y';
+ if($autoinstall['configure_nginx'] == 'default') $autoinstall['configure_nginx'] = 'y';
+ if($autoinstall['configure_nginx'] == 'y' || $autoinstall['configure_nginx'] == 'n'){
+ $tmp_configure_nginx = $autoinstall['configure_nginx'];
+ } else {
+ $tmp_configure_nginx = strtolower($inst->simple_query('Configure nginx Server', array('y', 'n'), 'y'));
+ }
+ if($tmp_configure_nginx == 'y') {
$conf['services']['web'] = true;
swriteln('Configuring nginx');
$inst->configure_nginx();
@@ -556,7 +646,14 @@
}
//** Configure Firewall
- if(strtolower($inst->simple_query('Configure Firewall Server', array('y', 'n'), 'y')) == 'y') {
+ $tmp_configure_firewall = 'y';
+ if($autoinstall['configure_firewall'] == 'default') $autoinstall['configure_firewall'] = 'y';
+ if($autoinstall['configure_firewall'] == 'y' || $autoinstall['configure_firewall'] == 'n'){
+ $tmp_configure_firewall = $autoinstall['configure_firewall'];
+ } else {
+ $tmp_configure_firewall = strtolower($inst->simple_query('Configure Firewall Server', array('y', 'n'), 'y'));
+ }
+ if($tmp_configure_firewall == 'y') {
//if($conf['bastille']['installed'] == true) {
//* Configure Bastille Firewall
$conf['services']['firewall'] = true;
@@ -579,7 +676,14 @@
//** Configure ISPConfig :-)
$install_ispconfig_interface_default = ($conf['mysql']['master_slave_setup'] == 'y')?'n':'y';
- if(strtolower($inst->simple_query('Install ISPConfig Web Interface', array('y', 'n'), $install_ispconfig_interface_default)) == 'y') {
+ $tmp_install_ispconfig_web_interface = $install_ispconfig_interface_default;
+ if($autoinstall['install_ispconfig_web_interface'] == 'default') $autoinstall['install_ispconfig_web_interface'] = $install_ispconfig_interface_default;
+ if($autoinstall['install_ispconfig_web_interface'] == 'y' || $autoinstall['install_ispconfig_web_interface'] == 'n'){
+ $tmp_install_ispconfig_web_interface = $autoinstall['install_ispconfig_web_interface'];
+ } else {
+ $tmp_install_ispconfig_web_interface = strtolower($inst->simple_query('Install ISPConfig Web Interface', array('y', 'n'), $install_ispconfig_interface_default));
+ }
+ if($tmp_install_ispconfig_web_interface == 'y') {
swriteln('Installing ISPConfig');
//** We want to check if the server is a module or cgi based php enabled server
@@ -597,13 +701,19 @@
*/
//** Customise the port ISPConfig runs on
- $ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080');
+ if($autoinstall['ispconfig_port'] == 'default') $autoinstall['ispconfig_port'] = '8080';
+ $ispconfig_vhost_port = (intval($autoinstall['ispconfig_port']) > 0 ? intval($autoinstall['ispconfig_port']) : $inst->free_query('ISPConfig Port', '8080'));
if($conf['apache']['installed'] == true) $conf['apache']['vhost_port'] = $ispconfig_vhost_port;
if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port'] = $ispconfig_vhost_port;
unset($ispconfig_vhost_port);
- if(strtolower($inst->simple_query('Enable SSL for the ISPConfig web interface', array('y', 'n'), 'y')) == 'y') {
- $inst->make_ispconfig_ssl_cert();
+ if($autoinstall['ispconfig_use_ssl'] == 'default') $autoinstall['ispconfig_use_ssl'] = 'y';
+ if($autoinstall['ispconfig_use_ssl'] == 'y' || $autoinstall['ispconfig_use_ssl'] == 'n'){
+ if($autoinstall['ispconfig_use_ssl'] == 'y') $inst->make_ispconfig_ssl_cert();
+ } else {
+ if(strtolower($inst->simple_query('Enable SSL for the ISPConfig web interface', array('y', 'n'), 'y')) == 'y') {
+ $inst->make_ispconfig_ssl_cert();
+ }
}
$inst->install_ispconfig_interface = true;
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 7d6348b..2fc9e0b 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -750,8 +750,13 @@
if(!stristr($options, 'dont-create-certs')) {
//* Create the SSL certificate
- $command = 'cd '.$config_dir.'; '
- .'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:4096 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509';
+ if(is_file('autoinstall.conf.php')){
+ $command = 'cd '.$config_dir.'; '
+ .'openssl req -new -subj \'/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd\' -outform PEM -out smtpd.cert -newkey rsa:4096 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509';
+ } else {
+ $command = 'cd '.$config_dir.'; '
+ .'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:4096 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509';
+ }
exec($command);
$command = 'chmod o= '.$config_dir.'/smtpd.key';
@@ -1683,7 +1688,11 @@
$ssl_pw = substr(md5(mt_rand()), 0, 6);
exec("openssl genrsa -des3 -passout pass:$ssl_pw -out $ssl_key_file 4096");
- exec("openssl req -new -passin pass:$ssl_pw -passout pass:$ssl_pw -key $ssl_key_file -out $ssl_csr_file");
+ if(is_file('autoinstall.conf.php')){
+ exec("openssl req -new -passin pass:$ssl_pw -passout pass:$ssl_pw -subj '/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd' -key $ssl_key_file -out $ssl_csr_file");
+ } else {
+ exec("openssl req -new -passin pass:$ssl_pw -passout pass:$ssl_pw -key $ssl_key_file -out $ssl_csr_file");
+ }
exec("openssl req -x509 -passin pass:$ssl_pw -passout pass:$ssl_pw -key $ssl_key_file -in $ssl_csr_file -out $ssl_crt_file -days 3650");
exec("openssl rsa -passin pass:$ssl_pw -in $ssl_key_file -out $ssl_key_file.insecure");
rename($ssl_key_file, $ssl_key_file.'.secure');
diff --git a/install/update.php b/install/update.php
index 6a1b9d1..1862ef2 100644
--- a/install/update.php
+++ b/install/update.php
@@ -83,6 +83,10 @@
if($dist['id'] == '') die('Linux distribution or version not recognized.');
+//** 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';
+
//** 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';
@@ -131,7 +135,13 @@
echo "This application will update ISPConfig 3 on your server.\n\n";
//* Make a backup before we start the update
-$do_backup = $inst->simple_query('Shall the script create a ISPConfig backup in /var/backup/ now?', array('yes', 'no'), 'yes');
+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');
+}
+
if($do_backup == 'yes') {
//* Create the backup directory
@@ -180,7 +190,7 @@
$finished = true;
} else {
swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
- $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
+ $conf["mysql"]["admin_password"] = (isset($autoupdate['mysql_root_password'])? $autoupdate['mysql_root_password'] : $inst->free_query('MySQL root password', $conf['mysql']['admin_password']));
}
} while ($finished == false);
unset($finished);
@@ -198,10 +208,12 @@
//** 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']);
+ 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']));
//* Initialize the MySQL server connection
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
@@ -244,7 +256,12 @@
*/
//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($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');
+}
if($reconfigure_master_database_rights_answer == 'yes') {
$inst->grant_master_database_rights();
@@ -252,7 +269,12 @@
//}
//** Shall the services be reconfigured during update
-$reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes', 'no'), 'yes');
+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');
+}
if($reconfigure_services_answer == 'yes') {
@@ -379,15 +401,23 @@
if ($conf['services']['web'] && $inst->install_ispconfig_interface) {
//** Customise the port ISPConfig runs on
$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'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number);
+ $conf['nginx']['vhost_port'] = (intval($autoupdate['ispconfig_port']) > 0 ? intval($autoupdate['ispconfig_port']) : $inst->free_query('ISPConfig Port', $ispconfig_port_number));
} else {
- $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number);
+ $conf['apache']['vhost_port'] = (intval($autoupdate['ispconfig_port']) > 0 ? intval($autoupdate['ispconfig_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') {
+ $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') {
$inst->make_ispconfig_ssl_cert();
}
}
@@ -395,7 +425,13 @@
$inst->install_ispconfig();
//** Configure Crontab
-$update_crontab_answer = $inst->simple_query('Reconfigure Crontab?', array('yes', 'no'), 'yes');
+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');
+}
+
if($update_crontab_answer == 'yes') {
swriteln('Updating Crontab');
$inst->install_crontab();
--
Gitblit v1.9.1