Skip to content

Commit 88c307b

Browse files
author
Marius Burkard
committed
Merge branch 'stable-3.1'
2 parents 49195dd + af01e42 commit 88c307b

File tree

55 files changed

+439
-431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+439
-431
lines changed

‎docs/autoinstall_samples/autoinstall.conf_sample.php‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
1-
<?php
2-
$autoinstall['language'] = 'en'; // de, en (default)
3-
$autoinstall['install_mode'] = 'standard'; // standard (default), expert
4-
5-
$autoinstall['hostname'] = 'server1.example.com'; // default
6-
$autoinstall['mysql_hostname'] = 'localhost'; // default: localhost
7-
$autoinstall['mysql_root_user'] = 'root'; // default: root
8-
$autoinstall['mysql_root_password'] = 'howtoforge';
9-
$autoinstall['mysql_database'] = 'dbispconfig'; // default: dbispcongig
10-
$autoinstall['mysql_charset'] = 'utf8'; // default: utf8
11-
$autoinstall['http_server'] = 'nginx'; // apache (default), nginx
12-
$autoinstall['ispconfig_port'] = '8080'; // default: 8080
13-
$autoinstall['ispconfig_use_ssl'] = 'y'; // y (default), n
14-
15-
/* SSL Settings */
16-
$autoinstall['ssl_cert_country'] = 'AU';
17-
$autoinstall['ssl_cert_state'] = 'Some-State';
18-
$autoinstall['ssl_cert_locality'] = 'Chicago';
19-
$autoinstall['ssl_cert_organisation'] = 'Internet Widgits Pty Ltd';
20-
$autoinstall['ssl_cert_organisation_unit'] = 'IT department';
21-
$autoinstall['ssl_cert_common_name'] = $autoinstall['hostname'];
22-
23-
/* optional expert mode settings, needed only for expert mode */
24-
$autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig
25-
$autoinstall['mysql_ispconfig_password'] = md5(uniqid(rand()));
26-
$autoinstall['join_multiserver_setup'] = 'n'; // y, n (default)
27-
$autoinstall['mysql_master_hostname'] = 'master.example.com';
28-
$autoinstall['mysql_master_root_user'] = 'root';
29-
$autoinstall['mysql_master_root_password'] = 'howtoforge';
30-
$autoinstall['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
31-
$autoinstall['configure_mail'] = 'y'; // y (default), n
32-
$autoinstall['configure_jailkit'] = 'y'; // y (default), n
33-
$autoinstall['configure_ftp'] = 'y'; // y (default), n
34-
$autoinstall['configure_dns'] = 'y'; // y (default), n
35-
$autoinstall['configure_apache'] = 'y'; // y (default), n
36-
$autoinstall['configure_nginx'] = 'y'; // y (default), n
37-
$autoinstall['configure_firewall'] = 'y'; // y (default), n
38-
$autoinstall['install_ispconfig_web_interface'] = 'y'; // y (default), n
39-
40-
/* optional update settings, needed only for updates */
41-
$autoupdate['do_backup'] = 'yes'; // yes (default), no
42-
$autoupdate['mysql_root_password'] = 'howtoforge';
43-
$autoupdate['mysql_master_hostname'] = 'master.example.com';
44-
$autoupdate['mysql_master_root_user'] = 'root';
45-
$autoupdate['mysql_master_root_password'] = 'howtoforge';
46-
$autoupdate['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
47-
$autoupdate['reconfigure_permissions_in_master_database'] = 'no'; // no (default), yes
48-
$autoupdate['reconfigure_services'] = 'yes'; // yes (default), no
49-
$autoupdate['ispconfig_port'] = '8080'; // default: 8080
50-
$autoupdate['create_new_ispconfig_ssl_cert'] = 'no'; // no (default), yes
51-
$autoupdate['reconfigure_crontab'] = 'yes'; // yes (default), no
1+
<?php
2+
$autoinstall['language'] = 'en'; // de, en (default)
3+
$autoinstall['install_mode'] = 'standard'; // standard (default), expert
4+
5+
$autoinstall['hostname'] = 'server1.example.com'; // default
6+
$autoinstall['mysql_hostname'] = 'localhost'; // default: localhost
7+
$autoinstall['mysql_root_user'] = 'root'; // default: root
8+
$autoinstall['mysql_root_password'] = 'howtoforge';
9+
$autoinstall['mysql_database'] = 'dbispconfig'; // default: dbispcongig
10+
$autoinstall['mysql_charset'] = 'utf8'; // default: utf8
11+
$autoinstall['http_server'] = 'nginx'; // apache (default), nginx
12+
$autoinstall['ispconfig_port'] = '8080'; // default: 8080
13+
$autoinstall['ispconfig_use_ssl'] = 'y'; // y (default), n
14+
15+
/* SSL Settings */
16+
$autoinstall['ssl_cert_country'] = 'AU';
17+
$autoinstall['ssl_cert_state'] = 'Some-State';
18+
$autoinstall['ssl_cert_locality'] = 'Chicago';
19+
$autoinstall['ssl_cert_organisation'] = 'Internet Widgits Pty Ltd';
20+
$autoinstall['ssl_cert_organisation_unit'] = 'IT department';
21+
$autoinstall['ssl_cert_common_name'] = $autoinstall['hostname'];
22+
23+
/* optional expert mode settings, needed only for expert mode */
24+
$autoinstall['mysql_ispconfig_user'] = 'ispconfig'; // default: ispconfig
25+
$autoinstall['mysql_ispconfig_password'] = md5(uniqid(rand()));
26+
$autoinstall['join_multiserver_setup'] = 'n'; // y, n (default)
27+
$autoinstall['mysql_master_hostname'] = 'master.example.com';
28+
$autoinstall['mysql_master_root_user'] = 'root';
29+
$autoinstall['mysql_master_root_password'] = 'howtoforge';
30+
$autoinstall['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
31+
$autoinstall['configure_mail'] = 'y'; // y (default), n
32+
$autoinstall['configure_jailkit'] = 'y'; // y (default), n
33+
$autoinstall['configure_ftp'] = 'y'; // y (default), n
34+
$autoinstall['configure_dns'] = 'y'; // y (default), n
35+
$autoinstall['configure_apache'] = 'y'; // y (default), n
36+
$autoinstall['configure_nginx'] = 'y'; // y (default), n
37+
$autoinstall['configure_firewall'] = 'y'; // y (default), n
38+
$autoinstall['install_ispconfig_web_interface'] = 'y'; // y (default), n
39+
40+
/* optional update settings, needed only for updates */
41+
$autoupdate['do_backup'] = 'yes'; // yes (default), no
42+
$autoupdate['mysql_root_password'] = 'howtoforge';
43+
$autoupdate['mysql_master_hostname'] = 'master.example.com';
44+
$autoupdate['mysql_master_root_user'] = 'root';
45+
$autoupdate['mysql_master_root_password'] = 'howtoforge';
46+
$autoupdate['mysql_master_database'] = 'dbispconfig'; // default: dbispconfig
47+
$autoupdate['reconfigure_permissions_in_master_database'] = 'no'; // no (default), yes
48+
$autoupdate['reconfigure_services'] = 'yes'; // yes (default), no
49+
$autoupdate['ispconfig_port'] = '8080'; // default: 8080
50+
$autoupdate['create_new_ispconfig_ssl_cert'] = 'no'; // no (default), yes
51+
$autoupdate['reconfigure_crontab'] = 'yes'; // yes (default), no
5252
?>

‎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/dist/lib/gentoo.lib.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,11 @@ public function configure_apps_vhost()
774774
//$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
775775
$content = str_replace('{fpm_socket}', $fpm_socket, $content);
776776
$content = str_replace('{cgi_socket}', $cgi_socket, $content);
777-
777+
778+
// SSL in apps vhost is off by default. Might change later.
779+
$content = str_replace('{ssl_on}', 'off', $content);
780+
$content = str_replace('{ssl_comment}', '#', $content);
781+
778782
wf($vhost_conf_dir.'/apps.vhost', $content);
779783

780784
// PHP-FPM

‎install/install.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
}
209209

210210
//* Initialize the MySQL server connection
211-
if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
211+
if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
212212
$conf['mysql']['host'] = $tmp_mysql_server_host;
213213
$conf['mysql']['port'] = $tmp_mysql_server_port;
214214
$conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
@@ -217,7 +217,7 @@
217217
$conf['mysql']['charset'] = $tmp_mysql_server_charset;
218218
$finished = true;
219219
} else {
220-
swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysqli_error());
220+
swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysqli_connect_error());
221221
}
222222
} while ($finished == false);
223223
unset($finished);
@@ -553,15 +553,15 @@
553553
$tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'mysql_master_database');
554554

555555
//* Initialize the MySQL server connection
556-
if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
556+
if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
557557
$conf['mysql']['master_host'] = $tmp_mysql_server_host;
558558
$conf['mysql']['master_port'] = $tmp_mysql_server_port;
559559
$conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
560560
$conf['mysql']['master_admin_password'] = $tmp_mysql_server_admin_password;
561561
$conf['mysql']['master_database'] = $tmp_mysql_server_database;
562562
$finished = true;
563563
} else {
564-
swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
564+
swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
565565
}
566566
} while ($finished == false);
567567
unset($finished);

‎install/lib/installer_base.lib.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2075,6 +2075,10 @@ public function configure_apps_vhost() {
20752075
}
20762076
$content = str_replace('{use_tcp}', $use_tcp, $content);
20772077
$content = str_replace('{use_socket}', $use_socket, $content);
2078+
2079+
// SSL in apps vhost is off by default. Might change later.
2080+
$content = str_replace('{ssl_on}', 'off', $content);
2081+
$content = str_replace('{ssl_comment}', '#', $content);
20782082

20792083
wf($vhost_conf_dir.'/apps.vhost', $content);
20802084

‎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

‎install/update.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
if(@mysqli_connect($conf["mysql"]["host"], $conf["mysql"]["admin_user"], $conf["mysql"]["admin_password"])) {
230230
$finished = true;
231231
} else {
232-
swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
232+
swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
233233
$conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password'],'mysql_root_password');
234234
}
235235
} while ($finished == false);
@@ -255,15 +255,15 @@
255255
$tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'mysql_master_database');
256256

257257
//* Initialize the MySQL server connection
258-
if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
258+
if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
259259
$conf['mysql']['master_host'] = $tmp_mysql_server_host;
260260
$conf['mysql']['master_port'] = $tmp_mysql_server_port;
261261
$conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
262262
$conf['mysql']['master_admin_password'] = $tmp_mysql_server_admin_password;
263263
$conf['mysql']['master_database'] = $tmp_mysql_server_database;
264264
$finished = true;
265265
} else {
266-
swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
266+
swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error());
267267
}
268268
} while ($finished == false);
269269
unset($finished);

0 commit comments

Comments
 (0)