diff --git a/docs/autoinstall_samples/autoinstall.ini.sample b/docs/autoinstall_samples/autoinstall.ini.sample index 1f4d9d7da0956d3b819bc86f4b4b519786a81898..bfe4c2d8f8cf2d90719ad8919fe5f60dab9f673f 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 diff --git a/install/tpl/mysql-virtual_outgoing_bcc.cf b/install/tpl/mysql-virtual_outgoing_bcc.cf index dd2bf9b039e79c8d218aed021120f418f0d8c30c..dfeb04b553ccb54b108c69db1fb652bea93b05af 100644 --- a/install/tpl/mysql-virtual_outgoing_bcc.cf +++ b/install/tpl/mysql-virtual_outgoing_bcc.cf @@ -1,8 +1,8 @@ -user = {mysql_server_ispconfig_user} -password = {mysql_server_ispconfig_password} -dbname = {mysql_server_database} -table = mail_user -select_field = sender_cc -where_field = email -additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disables$ +user = {mysql_server_ispconfig_user} +password = {mysql_server_ispconfig_password} +dbname = {mysql_server_database} +table = mail_user +select_field = sender_cc +where_field = email +additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disables$ hosts = 127.0.0.1 \ No newline at end of file diff --git a/install/tpl/mysql-virtual_outgoing_bcc.cf.master b/install/tpl/mysql-virtual_outgoing_bcc.cf.master index 6ca154f3b9fefc2d55610a30ef13c158a826ae1d..fbd82db5c03da7c2ffbb081c38a00634dce13d69 100644 --- a/install/tpl/mysql-virtual_outgoing_bcc.cf.master +++ b/install/tpl/mysql-virtual_outgoing_bcc.cf.master @@ -1,8 +1,8 @@ -user = {mysql_server_ispconfig_user} -password = {mysql_server_ispconfig_password} -dbname = {mysql_server_database} -table = mail_user -select_field = sender_cc -where_field = email -additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disablesmtp = 'n' +user = {mysql_server_ispconfig_user} +password = {mysql_server_ispconfig_password} +dbname = {mysql_server_database} +table = mail_user +select_field = sender_cc +where_field = email +additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disablesmtp = 'n' hosts = 127.0.0.1 \ No newline at end of file diff --git a/server/conf/hhvm_monit.master b/server/conf/hhvm_monit.master index 91642c535a7e084ba51758e687c7dec057966a21..79697eae5874d6fcac9d8143dfea1e11eece10de 100644 --- a/server/conf/hhvm_monit.master +++ b/server/conf/hhvm_monit.master @@ -1,3 +1,3 @@ -check process hhvm_{SYSTEM_USER} with pidfile /var/run/hhvm/hhvm_{SYSTEM_USER}.pid - start program = "/etc/init.d/hhvm_{SYSTEM_USER} restart" +check process hhvm_{SYSTEM_USER} with pidfile /var/run/hhvm/hhvm_{SYSTEM_USER}.pid + start program = "/etc/init.d/hhvm_{SYSTEM_USER} restart" stop program = "/etc/init.d/hhvm_{SYSTEM_USER} stop" \ No newline at end of file