gitlabFork/ISPConfig3.git - Solinfo Gitblit

parent: 71c5c292 | patch | commit | show whitespace

- Cleaned up autoinstall code - Added autoinstall for centos, opensuse and ...

Till Brehm

2014-07-09 b04e827ae6c3c41de9ca7c16373e143f06797ce1

- Cleaned up autoinstall code
- Added autoinstall for centos, opensuse and gentoo
- Added ini style config autoinstall option
- Autoinstall sample configuration files are now in docs folder
- Removed old autoupdate file

1 files renamed

1 files deleted

1 files added

6 files modified

	docs/autoinstall samples/autoinstall.conf_sample.php	8 ●●●●● patch \| view \| raw \| blame \| history
	docs/autoinstall samples/autoinstall.ini.sample	50 ●●●●● patch \| view \| raw \| blame \| history
	install/autoupdate.php	338 ●●●●● patch \| view \| raw \| blame \| history
	install/dist/lib/fedora.lib.php	7 ●●●●● patch \| view \| raw \| blame \| history
	install/dist/lib/gentoo.lib.php	8 ●●●●● patch \| view \| raw \| blame \| history
	install/dist/lib/opensuse.lib.php	8 ●●●●● patch \| view \| raw \| blame \| history
	install/install.php	211 ●●●●● patch \| view \| raw \| blame \| history
	install/lib/installer_base.lib.php	34 ●●●●● patch \| view \| raw \| blame \| history
	install/update.php	99 ●●●●● patch \| view \| raw \| blame \| history

 docs/autoinstall samples/autoinstall.conf_sample.php

File was renamed from install/autoinstall.conf_sample.php
@@ -12,6 +12,14 @@
$autoinstall['ispconfig_port'] = '8080'; // default: 8080

$autoinstall['ispconfig_use_ssl'] = 'y'; // y (default), n



/* SSL Settings */

$autoinstall['ssl_cert_country'] = 'AU';

$autoinstall['ssl_cert_state'] = 'Some-State';

$autoinstall['ssl_cert_locality'] = 'Chicago';

$autoinstall['ssl_cert_organisation'] = 'Internet Widgits Pty Ltd';

$autoinstall['ssl_cert_organisation_unit'] = 'IT department';

$autoinstall['ssl_cert_common_name'] = $autoinstall['hostname'];



/* optional expert mode settings, needed only for expert mode */

$autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig

$autoinstall['mysql_ispconfig_password'] = md5(uniqid(rand()));


 docs/autoinstall samples/autoinstall.ini.sample

New file
@@ -0,0 +1,50 @@
[install]

language=en

install_mode=standard

hostname=server1.example.com

mysql_hostname=localhost

mysql_root_user=root

mysql_root_password=ispconfig

mysql_database=dbispconfig

mysql_charset=utf8

http_server=apache

ispconfig_port=8080

ispconfig_use_ssl=y



[ssl_cert]

ssl_cert_country=AU

ssl_cert_state=Some-State

ssl_cert_locality=Chicago

ssl_cert_organisation=Internet Widgits Pty Ltd

ssl_cert_organisation_unit=IT department

ssl_cert_common_name=server1.example.com



[expert]

mysql_ispconfig_user=ispconfig

mysql_ispconfig_password=afStEratXBsgatRtsa42CadwhQ

join_multiserver_setup=n

mysql_master_hostname=master.example.com

mysql_master_root_user=root

mysql_master_root_password=ispconfig

mysql_master_database=dbispconfig

configure_mail=y

configure_jailkit=y

configure_ftp=y

configure_dns=y

configure_apache=y

configure_nginx=y

configure_firewall=y

install_ispconfig_web_interface=y



[update]

do_backup=yes

mysql_root_password=ispconfig

mysql_master_hostname=master.example.com

mysql_master_root_user=root

mysql_master_root_password=ispconfig

mysql_master_database=dbispconfig

reconfigure_permissions_in_master_database=no

reconfigure_services=yes

ispconfig_port=8080

create_new_ispconfig_ssl_cert=no

reconfigure_crontab=yes

 install/autoupdate.php

File was deleted

 install/dist/lib/fedora.lib.php

@@ -229,8 +229,13 @@

        if(!stristr($options, 'dont-create-certs')) {
            //* Create the SSL certificate
            if(AUTOINSTALL){
            $command = 'cd '.$config_dir.'; '
                .'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509';
                    ."openssl req -new -subj '/C=".$autoinstall['ssl_cert_country']."/ST=".$autoinstall['ssl_cert_state']."/L=".$autoinstall['ssl_cert_locality']."/O=".$autoinstall['ssl_cert_organisation']."/OU=".$autoinstall['ssl_cert_organisation_unit']."/CN=".$autoinstall['ssl_cert_common_name']."' -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 -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -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';

 install/dist/lib/gentoo.lib.php

@@ -119,9 +119,13 @@
        //* Create the SSL certificate
        if (!stristr($options, 'dont-create-certs'))
        {
            if(AUTOINSTALL){
            $command = 'cd '.$config_dir.'; '
                .'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509';
            exec($command);
                    ."openssl req -new -subj '/C=".$autoinstall['ssl_cert_country']."/ST=".$autoinstall['ssl_cert_state']."/L=".$autoinstall['ssl_cert_locality']."/O=".$autoinstall['ssl_cert_organisation']."/OU=".$autoinstall['ssl_cert_organisation_unit']."/CN=".$autoinstall['ssl_cert_common_name']."' -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 -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -outform PEM -out smtpd.cert -newkey rsa:4096 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509";
            }

            $command = 'chmod o= '.$config_dir.'/smtpd.key';
            caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);

 install/dist/lib/opensuse.lib.php

@@ -257,9 +257,13 @@

        if(!stristr($options, 'dont-create-certs')) {
            //* Create the SSL certificate
            if(AUTOINSTALL){
            $command = 'cd '.$config_dir.'; '
                .'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509';
            exec($command);
                    ."openssl req -new -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -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';
            }

            $command = 'chmod o= '.$config_dir.'/smtpd.key';
            caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);

 install/install.php

@@ -30,6 +30,30 @@

/*
    ISPConfig 3 installer.
	
    -------------------------------------------------------------------------------------
    - Interactive install
    -------------------------------------------------------------------------------------
    run:
	
    php install.php
	
    -------------------------------------------------------------------------------------
    - Noninteractive (autoinstall) mode
    -------------------------------------------------------------------------------------
	
    The autoinstall mode can read the installer 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 install.php --autoinstall=autoinstall.ini
	
    or
	
    php install.php --autoinstall=autoinstall.conf.php
	
*/

error_reporting(E_ALL|E_STRICT);
@@ -80,7 +104,27 @@

//** 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'));
        $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';
@@ -113,12 +157,7 @@
$inst->find_installed_apps();

//** Select the language and set default timezone
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['language'] = $inst->simple_query('Select language', array('en', 'de'), 'en','language');
$conf['timezone'] = get_system_timezone();

//* Set default theme
@@ -126,19 +165,13 @@
$conf['language_file_import_enabled'] = true;

//** Select installation mode
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');
}
$install_mode = $inst->simple_query('Installation mode', array('standard', 'expert'), 'standard','install_mode');


//** Get the hostname
$tmp_out = array();
exec('hostname -f', $tmp_out);
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]));
$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', @$tmp_out[0],'hostname');
unset($tmp_out);

// Check if the mysql functions are loaded in PHP
@@ -147,24 +180,17 @@
//** Get MySQL root credentials
$finished = false;
do {
    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']));
    $tmp_mysql_server_host = $inst->free_query('MySQL server hostname', $conf['mysql']['host'],'mysql_hostname');	 
    $tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user'],'mysql_root_user');	 
    $tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password'],'mysql_root_password');	 
    $tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database'],'mysql_database');	 
    $tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset'],'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");
        
        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']));
        $conf['mysql']['ispconfig_user'] = $inst->free_query('ISPConfig mysql database username', $conf['mysql']['ispconfig_user'],'mysql_ispconfig_user');	 
        $conf['mysql']['ispconfig_password'] = $inst->free_query('ISPConfig mysql database password', $conf['mysql']['ispconfig_password'],'mysql_ispconfig_password');
    }

    //* Initialize the MySQL server connection
@@ -199,12 +225,7 @@

    //* Configure Webserver - Apache or nginx
    if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
        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');
        }
        $http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache','http_server');
        if($http_server_to_use == 'apache'){
            $conf['nginx']['installed'] = false;
        } else {
@@ -321,19 +342,13 @@
    swriteln('Installing ISPConfig');

    //** Customize the port ISPConfig runs on
    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'));
    $ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080','ispconfig_port');
    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($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') {
    if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface', array('y', 'n'), 'y','ispconfig_use_ssl')) == 'y') {	 
            $inst->make_ispconfig_ssl_cert();
        }
    }

    $inst->install_ispconfig();
@@ -388,26 +403,16 @@
    //** 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($tmp_join_multiserver_setup == 'y') {
    if(strtolower($inst->simple_query('Shall this server join an existing ISPConfig multiserver setup', array('y', 'n'), 'n','join_multiserver_setup')) == 'y') {
        $conf['mysql']['master_slave_setup'] = 'y';

        //** Get MySQL root credentials
        $finished = false;
        do {
            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']));
            $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)) {
@@ -440,12 +445,7 @@

    //* Configure Webserver - Apache or nginx
    if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
        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');
        }
        $http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache','http_server');
        if($http_server_to_use == 'apache'){
            $conf['nginx']['installed'] = false;
        } else {
@@ -458,15 +458,7 @@
    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($tmp_configure_mail == 'y') {
    if(strtolower($inst->simple_query('Configure Mail', array('y', 'n') , 'y','configure_mail') ) == 'y') {

        $conf['services']['mail'] = true;

@@ -525,41 +517,20 @@
    }

    //** Configure Jailkit
    $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') {
    if(strtolower($inst->simple_query('Configure Jailkit', array('y', 'n'), 'y','configure_jailkit') ) == 'y') {
        swriteln('Configuring Jailkit');
        $inst->configure_jailkit();
    }

    //** Configure Pureftpd
    $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') {
    if(strtolower($inst->simple_query('Configure FTP Server', array('y', 'n'), 'y','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
    $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') {
    if(strtolower($inst->simple_query('Configure DNS Server', array('y', 'n'), 'y','configure_dns')) == 'y') {
        $conf['services']['dns'] = true;
        //* Configure DNS
        if($conf['powerdns']['installed'] == true) {
@@ -598,14 +569,7 @@
    //** 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");
        $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') {
        if(strtolower($inst->simple_query('Configure Apache Server', array('y', 'n'), 'y','configure_apache')) == 'y') {
            $conf['services']['web'] = true;
            swriteln('Configuring Apache');
            $inst->configure_apache();
@@ -623,14 +587,7 @@
    //** 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");
        $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') {
        if(strtolower($inst->simple_query('Configure nginx Server', array('y', 'n'), 'y','configure_nginx')) == 'y') {
            $conf['services']['web'] = true;
            swriteln('Configuring nginx');
            $inst->configure_nginx();
@@ -646,14 +603,7 @@
    }

    //** Configure Firewall
    $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(strtolower($inst->simple_query('Configure Firewall Server', array('y', 'n'), 'y','configure_firewall')) == 'y') {
        //if($conf['bastille']['installed'] == true) {
        //* Configure Bastille Firewall
        $conf['services']['firewall'] = true;
@@ -676,14 +626,7 @@

    //** Configure ISPConfig :-)
    $install_ispconfig_interface_default = ($conf['mysql']['master_slave_setup'] == 'y')?'n':'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') {
    if(strtolower($inst->simple_query('Install ISPConfig Web Interface', array('y', 'n'), $install_ispconfig_interface_default,'install_ispconfig_web_interface')) == 'y') {
        swriteln('Installing ISPConfig');

        //** We want to check if the server is a module or cgi based php enabled server
@@ -701,19 +644,13 @@
        */

        //** Customise the port ISPConfig runs on
        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'));
        $ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080','ispconfig_port');
        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($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') {
        if(strtolower($inst->simple_query('Enable SSL for the ISPConfig web interface', array('y', 'n'), 'y','ispconfig_use_ssl')) == 'y') {
                $inst->make_ispconfig_ssl_cert();
            }
        }

        $inst->install_ispconfig_interface = true;

 install/lib/installer_base.lib.php

@@ -56,12 +56,21 @@
        echo 'WARNING: '.$msg."\n";
    }

    public function simple_query($query, $answers, $default) {
    public function simple_query($query, $answers, $default, $name = '') {
        global $autoinstall;
        $finished = false;
        do {
            if($name != '' && $autoinstall[$name] != '') {
                if($autoinstall[$name] == 'default') {
                    $input = $default;
                } else {
                    $input = $autoinstall[$name];
                }
            } else {
            $answers_str = implode(',', $answers);
            swrite($this->lng($query).' ('.$answers_str.') ['.$default.']: ');
            $input = sread();
            }

            //* Stop the installation
            if($input == 'quit') {
@@ -86,9 +95,18 @@
        return $answer;
    }

    public function free_query($query, $default) {
    public function free_query($query, $default, $name = '') {
        global $autoinstall;
        if($name != '' && $autoinstall[$name] != '') {
            if($autoinstall[$name] == 'default') {
                $input = $default;
            } else {
                $input = $autoinstall[$name];
            }
        } else {
        swrite($this->lng($query).' ['.$default.']: ');
        $input = sread();
        }

        //* Stop the installation
        if($input == 'quit') {
@@ -638,7 +656,7 @@
    }

    public function configure_postfix($options = '') {
        global $conf;
        global $conf,$autoinstall;
        $cf = $conf['postfix'];
        $config_dir = $cf['config_dir'];

@@ -750,9 +768,9 @@

        if(!stristr($options, 'dont-create-certs')) {
            //* Create the SSL certificate
            if(is_file('autoinstall.conf.php')){
            if(AUTOINSTALL){
                $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';
                    ."openssl req -new -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -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';
@@ -1676,7 +1694,7 @@
    }

    public function make_ispconfig_ssl_cert() {
        global $conf;
        global $conf,$autoinstall;

        $install_dir = $conf['ispconfig_install_dir'];

@@ -1688,8 +1706,8 @@

        $ssl_pw = substr(md5(mt_rand()), 0, 6);
        exec("openssl genrsa -des3 -passout pass:$ssl_pw -out $ssl_key_file 4096");
        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");
        if(AUTOINSTALL){
            exec("openssl req -new -passin pass:$ssl_pw -passout pass:$ssl_pw -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -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");
        }

 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);
@@ -85,7 +109,26 @@

//** 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'));
        $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 +178,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 +228,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 +246,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 +292,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 +300,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,21 +429,14 @@
    $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();
    }
}
@@ -425,13 +444,7 @@
$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');
}

$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();

File was renamed from install/autoinstall.conf_sample.php
			@@ -12,6 +12,14 @@
			$autoinstall['ispconfig_port'] = '8080'; // default: 8080
			$autoinstall['ispconfig_use_ssl'] = 'y'; // y (default), n

			/* SSL Settings */
			$autoinstall['ssl_cert_country'] = 'AU';
			$autoinstall['ssl_cert_state'] = 'Some-State';
			$autoinstall['ssl_cert_locality'] = 'Chicago';
			$autoinstall['ssl_cert_organisation'] = 'Internet Widgits Pty Ltd';
			$autoinstall['ssl_cert_organisation_unit'] = 'IT department';
			$autoinstall['ssl_cert_common_name'] = $autoinstall['hostname'];

			/* optional expert mode settings, needed only for expert mode */
			$autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig
			$autoinstall['mysql_ispconfig_password'] = md5(uniqid(rand()));

New file
			@@ -0,0 +1,50 @@
			[install]
			language=en
			install_mode=standard
			hostname=server1.example.com
			mysql_hostname=localhost
			mysql_root_user=root
			mysql_root_password=ispconfig
			mysql_database=dbispconfig
			mysql_charset=utf8
			http_server=apache
			ispconfig_port=8080
			ispconfig_use_ssl=y

			[ssl_cert]
			ssl_cert_country=AU
			ssl_cert_state=Some-State
			ssl_cert_locality=Chicago
			ssl_cert_organisation=Internet Widgits Pty Ltd
			ssl_cert_organisation_unit=IT department
			ssl_cert_common_name=server1.example.com

			[expert]
			mysql_ispconfig_user=ispconfig
			mysql_ispconfig_password=afStEratXBsgatRtsa42CadwhQ
			join_multiserver_setup=n
			mysql_master_hostname=master.example.com
			mysql_master_root_user=root
			mysql_master_root_password=ispconfig
			mysql_master_database=dbispconfig
			configure_mail=y
			configure_jailkit=y
			configure_ftp=y
			configure_dns=y
			configure_apache=y
			configure_nginx=y
			configure_firewall=y
			install_ispconfig_web_interface=y

			[update]
			do_backup=yes
			mysql_root_password=ispconfig
			mysql_master_hostname=master.example.com
			mysql_master_root_user=root
			mysql_master_root_password=ispconfig
			mysql_master_database=dbispconfig
			reconfigure_permissions_in_master_database=no
			reconfigure_services=yes
			ispconfig_port=8080
			create_new_ispconfig_ssl_cert=no
			reconfigure_crontab=yes

			@@ -229,8 +229,13 @@

			if(!stristr($options, 'dont-create-certs')) {
			//* Create the SSL certificate
			if(AUTOINSTALL){
			$command = 'cd '.$config_dir.'; '
			.'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509';
			."openssl req -new -subj '/C=".$autoinstall['ssl_cert_country']."/ST=".$autoinstall['ssl_cert_state']."/L=".$autoinstall['ssl_cert_locality']."/O=".$autoinstall['ssl_cert_organisation']."/OU=".$autoinstall['ssl_cert_organisation_unit']."/CN=".$autoinstall['ssl_cert_common_name']."' -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 -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -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';

			@@ -119,9 +119,13 @@
			//* Create the SSL certificate
			if (!stristr($options, 'dont-create-certs'))
			{
			if(AUTOINSTALL){
			$command = 'cd '.$config_dir.'; '
			.'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509';
			exec($command);
			."openssl req -new -subj '/C=".$autoinstall['ssl_cert_country']."/ST=".$autoinstall['ssl_cert_state']."/L=".$autoinstall['ssl_cert_locality']."/O=".$autoinstall['ssl_cert_organisation']."/OU=".$autoinstall['ssl_cert_organisation_unit']."/CN=".$autoinstall['ssl_cert_common_name']."' -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 -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -outform PEM -out smtpd.cert -newkey rsa:4096 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509";
			}

			$command = 'chmod o= '.$config_dir.'/smtpd.key';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);

			@@ -257,9 +257,13 @@

			if(!stristr($options, 'dont-create-certs')) {
			//* Create the SSL certificate
			if(AUTOINSTALL){
			$command = 'cd '.$config_dir.'; '
			.'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509';
			exec($command);
			."openssl req -new -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -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';
			}

			$command = 'chmod o= '.$config_dir.'/smtpd.key';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);

			@@ -30,6 +30,30 @@

			/*
			ISPConfig 3 installer.

			-------------------------------------------------------------------------------------
			- Interactive install
			-------------------------------------------------------------------------------------
			run:

			php install.php

			-------------------------------------------------------------------------------------
			- Noninteractive (autoinstall) mode
			-------------------------------------------------------------------------------------

			The autoinstall mode can read the installer 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 install.php --autoinstall=autoinstall.ini

			or

			php install.php --autoinstall=autoinstall.conf.php

			*/

			error_reporting(E_ALL\|E_STRICT);
			@@ -80,7 +104,27 @@

			//** 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'));
			$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';
			@@ -113,12 +157,7 @@
			$inst->find_installed_apps();

			//** Select the language and set default timezone
			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['language'] = $inst->simple_query('Select language', array('en', 'de'), 'en','language');
			$conf['timezone'] = get_system_timezone();

			//* Set default theme
			@@ -126,19 +165,13 @@
			$conf['language_file_import_enabled'] = true;

			//** Select installation mode
			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');
			}
			$install_mode = $inst->simple_query('Installation mode', array('standard', 'expert'), 'standard','install_mode');


			//** Get the hostname
			$tmp_out = array();
			exec('hostname -f', $tmp_out);
			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]));
			$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', @$tmp_out[0],'hostname');
			unset($tmp_out);

			// Check if the mysql functions are loaded in PHP
			@@ -147,24 +180,17 @@
			//** Get MySQL root credentials
			$finished = false;
			do {
			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']));
			$tmp_mysql_server_host = $inst->free_query('MySQL server hostname', $conf['mysql']['host'],'mysql_hostname');
			$tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user'],'mysql_root_user');
			$tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password'],'mysql_root_password');
			$tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database'],'mysql_database');
			$tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset'],'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");

			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']));
			$conf['mysql']['ispconfig_user'] = $inst->free_query('ISPConfig mysql database username', $conf['mysql']['ispconfig_user'],'mysql_ispconfig_user');
			$conf['mysql']['ispconfig_password'] = $inst->free_query('ISPConfig mysql database password', $conf['mysql']['ispconfig_password'],'mysql_ispconfig_password');
			}

			//* Initialize the MySQL server connection
			@@ -199,12 +225,7 @@

			//* Configure Webserver - Apache or nginx
			if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
			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');
			}
			$http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache','http_server');
			if($http_server_to_use == 'apache'){
			$conf['nginx']['installed'] = false;
			} else {
			@@ -321,19 +342,13 @@
			swriteln('Installing ISPConfig');

			//** Customize the port ISPConfig runs on
			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'));
			$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080','ispconfig_port');
			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($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') {
			if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface', array('y', 'n'), 'y','ispconfig_use_ssl')) == 'y') {
			$inst->make_ispconfig_ssl_cert();
			}
			}

			$inst->install_ispconfig();
			@@ -388,26 +403,16 @@
			//** 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($tmp_join_multiserver_setup == 'y') {
			if(strtolower($inst->simple_query('Shall this server join an existing ISPConfig multiserver setup', array('y', 'n'), 'n','join_multiserver_setup')) == 'y') {
			$conf['mysql']['master_slave_setup'] = 'y';

			//** Get MySQL root credentials
			$finished = false;
			do {
			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']));
			$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)) {
			@@ -440,12 +445,7 @@

			//* Configure Webserver - Apache or nginx
			if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
			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');
			}
			$http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache','http_server');
			if($http_server_to_use == 'apache'){
			$conf['nginx']['installed'] = false;
			} else {
			@@ -458,15 +458,7 @@
			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($tmp_configure_mail == 'y') {
			if(strtolower($inst->simple_query('Configure Mail', array('y', 'n') , 'y','configure_mail') ) == 'y') {

			$conf['services']['mail'] = true;

			@@ -525,41 +517,20 @@
			}

			//** Configure Jailkit
			$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') {
			if(strtolower($inst->simple_query('Configure Jailkit', array('y', 'n'), 'y','configure_jailkit') ) == 'y') {
			swriteln('Configuring Jailkit');
			$inst->configure_jailkit();
			}

			//** Configure Pureftpd
			$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') {
			if(strtolower($inst->simple_query('Configure FTP Server', array('y', 'n'), 'y','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
			$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') {
			if(strtolower($inst->simple_query('Configure DNS Server', array('y', 'n'), 'y','configure_dns')) == 'y') {
			$conf['services']['dns'] = true;
			//* Configure DNS
			if($conf['powerdns']['installed'] == true) {
			@@ -598,14 +569,7 @@
			//** 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");
			$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') {
			if(strtolower($inst->simple_query('Configure Apache Server', array('y', 'n'), 'y','configure_apache')) == 'y') {
			$conf['services']['web'] = true;
			swriteln('Configuring Apache');
			$inst->configure_apache();
			@@ -623,14 +587,7 @@
			//** 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");
			$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') {
			if(strtolower($inst->simple_query('Configure nginx Server', array('y', 'n'), 'y','configure_nginx')) == 'y') {
			$conf['services']['web'] = true;
			swriteln('Configuring nginx');
			$inst->configure_nginx();
			@@ -646,14 +603,7 @@
			}

			//** Configure Firewall
			$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(strtolower($inst->simple_query('Configure Firewall Server', array('y', 'n'), 'y','configure_firewall')) == 'y') {
			//if($conf['bastille']['installed'] == true) {
			//* Configure Bastille Firewall
			$conf['services']['firewall'] = true;
			@@ -676,14 +626,7 @@

			//** Configure ISPConfig :-)
			$install_ispconfig_interface_default = ($conf['mysql']['master_slave_setup'] == 'y')?'n':'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') {
			if(strtolower($inst->simple_query('Install ISPConfig Web Interface', array('y', 'n'), $install_ispconfig_interface_default,'install_ispconfig_web_interface')) == 'y') {
			swriteln('Installing ISPConfig');

			//** We want to check if the server is a module or cgi based php enabled server
			@@ -701,19 +644,13 @@
			*/

			//** Customise the port ISPConfig runs on
			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'));
			$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080','ispconfig_port');
			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($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') {
			if(strtolower($inst->simple_query('Enable SSL for the ISPConfig web interface', array('y', 'n'), 'y','ispconfig_use_ssl')) == 'y') {
			$inst->make_ispconfig_ssl_cert();
			}
			}

			$inst->install_ispconfig_interface = true;

			@@ -56,12 +56,21 @@
			echo 'WARNING: '.$msg."\n";
			}

			public function simple_query($query, $answers, $default) {
			public function simple_query($query, $answers, $default, $name = '') {
			global $autoinstall;
			$finished = false;
			do {
			if($name != '' && $autoinstall[$name] != '') {
			if($autoinstall[$name] == 'default') {
			$input = $default;
			} else {
			$input = $autoinstall[$name];
			}
			} else {
			$answers_str = implode(',', $answers);
			swrite($this->lng($query).' ('.$answers_str.') ['.$default.']: ');
			$input = sread();
			}

			//* Stop the installation
			if($input == 'quit') {
			@@ -86,9 +95,18 @@
			return $answer;
			}

			public function free_query($query, $default) {
			public function free_query($query, $default, $name = '') {
			global $autoinstall;
			if($name != '' && $autoinstall[$name] != '') {
			if($autoinstall[$name] == 'default') {
			$input = $default;
			} else {
			$input = $autoinstall[$name];
			}
			} else {
			swrite($this->lng($query).' ['.$default.']: ');
			$input = sread();
			}

			//* Stop the installation
			if($input == 'quit') {
			@@ -638,7 +656,7 @@
			}

			public function configure_postfix($options = '') {
			global $conf;
			global $conf,$autoinstall;
			$cf = $conf['postfix'];
			$config_dir = $cf['config_dir'];

			@@ -750,9 +768,9 @@

			if(!stristr($options, 'dont-create-certs')) {
			//* Create the SSL certificate
			if(is_file('autoinstall.conf.php')){
			if(AUTOINSTALL){
			$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';
			."openssl req -new -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -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';
			@@ -1676,7 +1694,7 @@
			}

			public function make_ispconfig_ssl_cert() {
			global $conf;
			global $conf,$autoinstall;

			$install_dir = $conf['ispconfig_install_dir'];

			@@ -1688,8 +1706,8 @@

			$ssl_pw = substr(md5(mt_rand()), 0, 6);
			exec("openssl genrsa -des3 -passout pass:$ssl_pw -out $ssl_key_file 4096");
			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");
			if(AUTOINSTALL){
			exec("openssl req -new -passin pass:$ssl_pw -passout pass:$ssl_pw -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -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");
			}

			@@ -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);
			@@ -85,7 +109,26 @@

			//** 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'));
			$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 +178,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 +228,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 +246,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 +292,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 +300,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,21 +429,14 @@
			$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();
			}
			}
			@@ -425,13 +444,7 @@
			$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');
			}

			$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();