Commit 06668980 authored by Till Brehm's avatar Till Brehm
Browse files

Fixed #4236 and #4429 missing autoinstall values.

parent 7e416522
...@@ -4,6 +4,7 @@ $autoinstall['install_mode'] = 'standard'; // standard (default), expert ...@@ -4,6 +4,7 @@ $autoinstall['install_mode'] = 'standard'; // standard (default), expert
$autoinstall['hostname'] = 'server1.example.com'; // default $autoinstall['hostname'] = 'server1.example.com'; // default
$autoinstall['mysql_hostname'] = 'localhost'; // default: localhost $autoinstall['mysql_hostname'] = 'localhost'; // default: localhost
$autoinstall['mysql_port'] = '3306'; // default: 3306
$autoinstall['mysql_root_user'] = 'root'; // default: root $autoinstall['mysql_root_user'] = 'root'; // default: root
$autoinstall['mysql_root_password'] = 'howtoforge'; $autoinstall['mysql_root_password'] = 'howtoforge';
$autoinstall['mysql_database'] = 'dbispconfig'; // default: dbispcongig $autoinstall['mysql_database'] = 'dbispconfig'; // default: dbispcongig
...@@ -20,6 +21,7 @@ $autoinstall['ssl_cert_locality'] = 'Chicago'; ...@@ -20,6 +21,7 @@ $autoinstall['ssl_cert_locality'] = 'Chicago';
$autoinstall['ssl_cert_organisation'] = 'Internet Widgits Pty Ltd'; $autoinstall['ssl_cert_organisation'] = 'Internet Widgits Pty Ltd';
$autoinstall['ssl_cert_organisation_unit'] = 'IT department'; $autoinstall['ssl_cert_organisation_unit'] = 'IT department';
$autoinstall['ssl_cert_common_name'] = $autoinstall['hostname']; $autoinstall['ssl_cert_common_name'] = $autoinstall['hostname'];
$autoinstall['ssl_cert_email'] = 'hostmaster@'.$autoinstall['hostname'];
/* optional expert mode settings, needed only for expert mode */ /* optional expert mode settings, needed only for expert mode */
$autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig $autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig
......
...@@ -3,6 +3,7 @@ language=en ...@@ -3,6 +3,7 @@ language=en
install_mode=standard install_mode=standard
hostname=server1.example.com hostname=server1.example.com
mysql_hostname=localhost mysql_hostname=localhost
mysql_port=3306
mysql_root_user=root mysql_root_user=root
mysql_root_password=ispconfig mysql_root_password=ispconfig
mysql_database=dbispconfig mysql_database=dbispconfig
...@@ -19,6 +20,7 @@ ssl_cert_locality=Chicago ...@@ -19,6 +20,7 @@ ssl_cert_locality=Chicago
ssl_cert_organisation=Internet Widgits Pty Ltd ssl_cert_organisation=Internet Widgits Pty Ltd
ssl_cert_organisation_unit=IT department ssl_cert_organisation_unit=IT department
ssl_cert_common_name=server1.example.com ssl_cert_common_name=server1.example.com
ssl_cert_email=hostmaster@example.com
[expert] [expert]
mysql_ispconfig_user=ispconfig mysql_ispconfig_user=ispconfig
......
...@@ -1619,12 +1619,12 @@ class installer_base { ...@@ -1619,12 +1619,12 @@ class installer_base {
// Create SSL Certificate for localhost // Create SSL Certificate for localhost
// Ensure no line is left blank // Ensure no line is left blank
echo "writing new private key to 'localhost.key'\n-----\n"; echo "writing new private key to 'localhost.key'\n-----\n";
$ssl_country = $this->free_query('Country Name (2 letter code)', 'AU'); $ssl_country = $this->free_query('Country Name (2 letter code)', 'AU','ssl_cert_country');
$ssl_locality = $this->free_query('Locality Name (eg, city)', 'City Name'); $ssl_locality = $this->free_query('Locality Name (eg, city)', 'City Name','ssl_cert_locality');
$ssl_organisation = $this->free_query('Organization Name (eg, company)', 'Internet Widgits Pty Ltd'); $ssl_organisation = $this->free_query('Organization Name (eg, company)', 'Internet Widgits Pty Ltd','ssl_cert_organisation');
$ssl_organisation_unit = $this->free_query('Organizational Unit Name (eg, section)', 'Infrastructure'); $ssl_organisation_unit = $this->free_query('Organizational Unit Name (eg, section)', 'Infrastructure','ssl_cert_organisation_unit');
$ssl_domain = $this->free_query('Common Name (e.g. server FQDN or YOUR name)', $conf['hostname']); $ssl_domain = $this->free_query('Common Name (e.g. server FQDN or YOUR name)', $conf['hostname'],'ssl_cert_common_name');
$ssl_email = $this->free_query('Email Address', 'hostmaster@'.$conf['hostname']); $ssl_email = $this->free_query('Email Address', 'hostmaster@'.$conf['hostname'],'ssl_cert_email');
$tpl = new tpl('metronome_conf_ssl.master'); $tpl = new tpl('metronome_conf_ssl.master');
$tpl->setVar('ssl_country',$ssl_country); $tpl->setVar('ssl_country',$ssl_country);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment