From 0666898001a6571f5d778beeadbd070284628a81 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 24 Jan 2017 16:34:33 +0100
Subject: [PATCH] Fixed #4236 and #4429 missing autoinstall values.

---
 docs/autoinstall_samples/autoinstall.conf_sample.php |  2 ++
 docs/autoinstall_samples/autoinstall.ini.sample      |  2 ++
 install/lib/installer_base.lib.php                   | 12 ++++++------
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/autoinstall_samples/autoinstall.conf_sample.php b/docs/autoinstall_samples/autoinstall.conf_sample.php
index 59a6f6e5f7..b5f3a57730 100644
--- a/docs/autoinstall_samples/autoinstall.conf_sample.php
+++ b/docs/autoinstall_samples/autoinstall.conf_sample.php
@@ -4,6 +4,7 @@ $autoinstall['install_mode'] = 'standard'; // standard (default), expert
 
 $autoinstall['hostname'] = 'server1.example.com'; // default
 $autoinstall['mysql_hostname'] = 'localhost'; // default: localhost
+$autoinstall['mysql_port'] = '3306'; // default: 3306
 $autoinstall['mysql_root_user'] = 'root'; // default: root
 $autoinstall['mysql_root_password'] = 'howtoforge';
 $autoinstall['mysql_database'] = 'dbispconfig'; // default: dbispcongig
@@ -20,6 +21,7 @@ $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'];
+$autoinstall['ssl_cert_email'] = 'hostmaster@'.$autoinstall['hostname'];
 
 /* optional expert mode settings, needed only for expert mode */
 $autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig
diff --git a/docs/autoinstall_samples/autoinstall.ini.sample b/docs/autoinstall_samples/autoinstall.ini.sample
index e3839c2edf..74523ffbc3 100644
--- a/docs/autoinstall_samples/autoinstall.ini.sample
+++ b/docs/autoinstall_samples/autoinstall.ini.sample
@@ -3,6 +3,7 @@ language=en
 install_mode=standard
 hostname=server1.example.com
 mysql_hostname=localhost
+mysql_port=3306
 mysql_root_user=root
 mysql_root_password=ispconfig
 mysql_database=dbispconfig
@@ -19,6 +20,7 @@ ssl_cert_locality=Chicago
 ssl_cert_organisation=Internet Widgits Pty Ltd
 ssl_cert_organisation_unit=IT department
 ssl_cert_common_name=server1.example.com
+ssl_cert_email=hostmaster@example.com
 
 [expert]
 mysql_ispconfig_user=ispconfig
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 2e1b5fb15d..edf3d21369 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1619,12 +1619,12 @@ class installer_base {
             // Create SSL Certificate for localhost
             // Ensure no line is left blank
 			echo "writing new private key to 'localhost.key'\n-----\n";
-			$ssl_country = $this->free_query('Country Name (2 letter code)', 'AU');
-            $ssl_locality = $this->free_query('Locality Name (eg, city)', 'City Name');
-            $ssl_organisation = $this->free_query('Organization Name (eg, company)', 'Internet Widgits Pty Ltd');
-            $ssl_organisation_unit = $this->free_query('Organizational Unit Name (eg, section)', 'Infrastructure');
-            $ssl_domain = $this->free_query('Common Name (e.g. server FQDN or YOUR name)', $conf['hostname']);
-            $ssl_email = $this->free_query('Email Address', 'hostmaster@'.$conf['hostname']);
+			$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_cert_locality');
+            $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_cert_organisation_unit');
+            $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_cert_email');
 
             $tpl = new tpl('metronome_conf_ssl.master');
             $tpl->setVar('ssl_country',$ssl_country);
-- 
GitLab