Skip to content

Commit 10acaf2

Browse files
author
Marius Burkard
committed
- some more line-break changes
1 parent 88ada44 commit 10acaf2

File tree

4 files changed

+65
-65
lines changed

4 files changed

+65
-65
lines changed

‎docs/autoinstall_samples/autoinstall.ini.sample‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
[install]
2-
language=en
3-
install_mode=standard
4-
hostname=server1.example.com
5-
mysql_hostname=localhost
6-
mysql_root_user=root
7-
mysql_root_password=ispconfig
8-
mysql_database=dbispconfig
9-
mysql_charset=utf8
10-
http_server=apache
11-
ispconfig_port=8080
12-
ispconfig_use_ssl=y
13-
14-
[ssl_cert]
15-
ssl_cert_country=AU
16-
ssl_cert_state=Some-State
17-
ssl_cert_locality=Chicago
18-
ssl_cert_organisation=Internet Widgits Pty Ltd
19-
ssl_cert_organisation_unit=IT department
20-
ssl_cert_common_name=server1.example.com
21-
22-
[expert]
23-
mysql_ispconfig_user=ispconfig
24-
mysql_ispconfig_password=afStEratXBsgatRtsa42CadwhQ
25-
join_multiserver_setup=n
26-
mysql_master_hostname=master.example.com
27-
mysql_master_root_user=root
28-
mysql_master_root_password=ispconfig
29-
mysql_master_database=dbispconfig
30-
configure_mail=y
31-
configure_jailkit=y
32-
configure_ftp=y
33-
configure_dns=y
34-
configure_apache=y
35-
configure_nginx=y
36-
configure_firewall=y
37-
install_ispconfig_web_interface=y
38-
39-
[update]
40-
do_backup=yes
41-
mysql_root_password=ispconfig
42-
mysql_master_hostname=master.example.com
43-
mysql_master_root_user=root
44-
mysql_master_root_password=ispconfig
45-
mysql_master_database=dbispconfig
46-
reconfigure_permissions_in_master_database=no
47-
reconfigure_services=yes
48-
ispconfig_port=8080
49-
create_new_ispconfig_ssl_cert=no
1+
[install]
2+
language=en
3+
install_mode=standard
4+
hostname=server1.example.com
5+
mysql_hostname=localhost
6+
mysql_root_user=root
7+
mysql_root_password=ispconfig
8+
mysql_database=dbispconfig
9+
mysql_charset=utf8
10+
http_server=apache
11+
ispconfig_port=8080
12+
ispconfig_use_ssl=y
13+
14+
[ssl_cert]
15+
ssl_cert_country=AU
16+
ssl_cert_state=Some-State
17+
ssl_cert_locality=Chicago
18+
ssl_cert_organisation=Internet Widgits Pty Ltd
19+
ssl_cert_organisation_unit=IT department
20+
ssl_cert_common_name=server1.example.com
21+
22+
[expert]
23+
mysql_ispconfig_user=ispconfig
24+
mysql_ispconfig_password=afStEratXBsgatRtsa42CadwhQ
25+
join_multiserver_setup=n
26+
mysql_master_hostname=master.example.com
27+
mysql_master_root_user=root
28+
mysql_master_root_password=ispconfig
29+
mysql_master_database=dbispconfig
30+
configure_mail=y
31+
configure_jailkit=y
32+
configure_ftp=y
33+
configure_dns=y
34+
configure_apache=y
35+
configure_nginx=y
36+
configure_firewall=y
37+
install_ispconfig_web_interface=y
38+
39+
[update]
40+
do_backup=yes
41+
mysql_root_password=ispconfig
42+
mysql_master_hostname=master.example.com
43+
mysql_master_root_user=root
44+
mysql_master_root_password=ispconfig
45+
mysql_master_database=dbispconfig
46+
reconfigure_permissions_in_master_database=no
47+
reconfigure_services=yes
48+
ispconfig_port=8080
49+
create_new_ispconfig_ssl_cert=no
5050
reconfigure_crontab=yes

‎install/tpl/mysql-virtual_outgoing_bcc.cf‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
user = {mysql_server_ispconfig_user}
2-
password = {mysql_server_ispconfig_password}
3-
dbname = {mysql_server_database}
4-
table = mail_user
5-
select_field = sender_cc
6-
where_field = email
7-
additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disables$
1+
user = {mysql_server_ispconfig_user}
2+
password = {mysql_server_ispconfig_password}
3+
dbname = {mysql_server_database}
4+
table = mail_user
5+
select_field = sender_cc
6+
where_field = email
7+
additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disables$
88
hosts = 127.0.0.1

‎install/tpl/mysql-virtual_outgoing_bcc.cf.master‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
user = {mysql_server_ispconfig_user}
2-
password = {mysql_server_ispconfig_password}
3-
dbname = {mysql_server_database}
4-
table = mail_user
5-
select_field = sender_cc
6-
where_field = email
7-
additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disablesmtp = 'n'
1+
user = {mysql_server_ispconfig_user}
2+
password = {mysql_server_ispconfig_password}
3+
dbname = {mysql_server_database}
4+
table = mail_user
5+
select_field = sender_cc
6+
where_field = email
7+
additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disablesmtp = 'n'
88
hosts = 127.0.0.1

‎server/conf/hhvm_monit.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
check process hhvm_{SYSTEM_USER} with pidfile /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
2-
start program = "/etc/init.d/hhvm_{SYSTEM_USER} restart"
1+
check process hhvm_{SYSTEM_USER} with pidfile /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
2+
start program = "/etc/init.d/hhvm_{SYSTEM_USER} restart"
33
stop program = "/etc/init.d/hhvm_{SYSTEM_USER} stop"

0 commit comments

Comments
 (0)