From 88c307b0ef30a94ea5e9b52a1f9078bf04033d29 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 10 Feb 2016 06:55:01 -0500
Subject: [PATCH] Merge branch 'stable-3.1'

---
 docs/autoinstall_samples/autoinstall.ini.sample |   98 ++++++++++++++++++++++++------------------------
 1 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/docs/autoinstall_samples/autoinstall.ini.sample b/docs/autoinstall_samples/autoinstall.ini.sample
index 1f4d9d7..bfe4c2d 100644
--- a/docs/autoinstall_samples/autoinstall.ini.sample
+++ b/docs/autoinstall_samples/autoinstall.ini.sample
@@ -1,50 +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
+[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
\ No newline at end of file

--
Gitblit v1.9.1