Skip to content

Commit 42e4c6e

Browse files
author
Florian Schaal
committed
2 parents 5d45b76 + 88c307b commit 42e4c6e

File tree

68 files changed

+656
-462
lines changed

Some content is hidden

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

68 files changed

+656
-462
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

‎docs/examples/blacklist_helo.master‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# blacklist_helo - after permit_sasl, used to stop common spammers/misconfigurations
2+
#
3+
# This file can be used to block hostnames used in smtp HELO command which are known bad.
4+
# Occasionally you will run into legitimate mail servers which are misconfigured and end
5+
# up blocked here, so this is not enabled by default, but it is useful if you are prepared
6+
# to address those cases. .local is particularly problematic, and commented out by default.
7+
#
8+
# Note that any server hitting this check is misconfigured, all of the names below are bogus
9+
# and not allowed per RFC 2821.
10+
#
11+
# If your own users are blocked by this, they are not authenticating to your server when
12+
# sending (this check is after permit_sasl, which permits authenticated senders).
13+
#
14+
# Instructions:
15+
#
16+
# Copy this file to /usr/local/ispconfig/server/conf-custom/install/blacklist_helo.master,
17+
# as well as /etc/postfix/blacklist_helo, so your changes are not overwritten with ispconfig
18+
# updates.
19+
20+
# probably just put REJECT lines in here,
21+
# as OK lines will bypass a lot of other checks you may want done
22+
# (use DUNNO instead of OK)
23+
#
24+
25+
# common for spammers (check https://data.iana.org/TLD/tlds-alpha-by-domain.txt and remove valid tld's occasionally)
26+
/.*\.administrator$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
27+
/.*\.admin$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
28+
/.*\.adsl$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
29+
/.*\.arpa$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
30+
/.*\.bac$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
31+
/.*\.coma$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
32+
/.*\.dhcp$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
33+
/.*\.dlink$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
34+
/.*\.dns$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
35+
/.*\.domain$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
36+
/.*\.dynamic$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
37+
/.*\.dyndns\.org$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
38+
/.*\.dyn$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
39+
/.*\.firewall$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
40+
/.*\.gateway$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
41+
/.*\.home$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
42+
/.*\.internal$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
43+
/.*\.intern$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
44+
/.*\.janak$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
45+
/.*\.kornet$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
46+
/.*\.lab$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
47+
/.*\.lan$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
48+
/.*\.localdomain$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
49+
/.*\.localhost$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
50+
51+
# .local is used by spammers a lot, but too many otherwise legit servers hit it
52+
# (instead of REJECT, should send to greylisting)
53+
#/.*\.local$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
54+
55+
/.*\.loc$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
56+
/.*\.lokal$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
57+
/.*\.mail$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
58+
/.*\.nat$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
59+
/.*\.netzwerk$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
60+
/.*\.pc$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
61+
/.*\.privat$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
62+
/.*\.private$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
63+
/.*\.router$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
64+
/.*\.setup$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
65+
66+
/.*\.119$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
67+
/.*\.beeline$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
68+
/.*\.cici$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
69+
/.*\.gt_3g$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
70+
/.*\.gt-3g$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
71+
/.*\.hananet$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
72+
/.*\.skbroadband$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
73+
/.*\.tbroad$/ REJECT HELO hostname is using a top level domain that does not exist. See RFC 2821 section 3.6.
74+

‎install/dist/lib/gentoo.lib.php‎

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

781785
// PHP-FPM

‎install/install.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
} while (!$check);
189189

190190
// Check if the mysql functions are loaded in PHP
191-
if(!function_exists('mysql_connect')) die('No PHP MySQL functions available. Please ensure that the PHP MySQL module is loaded.');
191+
if(!function_exists('mysqli_connect')) die('No PHP MySQLi functions available. Please ensure that the PHP MySQL module is loaded.');
192192

193193
//** Get MySQL root credentials
194194
$finished = false;
@@ -208,7 +208,7 @@
208208
}
209209

210210
//* Initialize the MySQL server connection
211-
if(@mysql_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').' '.mysql_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(@mysql_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').' '.mysql_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: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -896,13 +896,16 @@ public function configure_postfix($options = '') {
896896
}
897897
unset($server_ini_array);
898898

899+
$tmp = str_replace('.','\.',$conf['hostname']);
900+
899901
$postconf_placeholders = array('{config_dir}' => $config_dir,
900902
'{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
901903
'{vmail_userid}' => $cf['vmail_userid'],
902904
'{vmail_groupid}' => $cf['vmail_groupid'],
903905
'{rbl_list}' => $rbl_list,
904906
'{greylisting}' => $greylisting,
905907
'{reject_slm}' => $reject_sender_login_mismatch,
908+
'{myhostname}' => $tmp,
906909
);
907910

908911
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_postfix.conf.master', 'tpl/debian_postfix.conf.master');
@@ -933,6 +936,27 @@ public function configure_postfix($options = '') {
933936
if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
934937
exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
935938

939+
//* Create auxillary postfix conf files
940+
$configfile = 'helo_access';
941+
if(is_file($config_dir.'/'.$configfile)) {
942+
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
943+
chmod($config_dir.'/'.$configfile.'~', 0400);
944+
}
945+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
946+
$content = strtr($content, $postconf_placeholders);
947+
# todo: look up this server's ip addrs and loop through each
948+
# todo: look up domains hosted on this server and loop through each
949+
wf($config_dir.'/'.$configfile, $content);
950+
951+
$configfile = 'blacklist_helo';
952+
if(is_file($config_dir.'/'.$configfile)) {
953+
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
954+
chmod($config_dir.'/'.$configfile.'~', 0400);
955+
}
956+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
957+
$content = strtr($content, $postconf_placeholders);
958+
wf($config_dir.'/'.$configfile, $content);
959+
936960
//* Make a backup copy of the main.cf file
937961
copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
938962

@@ -2052,6 +2076,10 @@ public function configure_apps_vhost() {
20522076
}
20532077
$content = str_replace('{use_tcp}', $use_tcp, $content);
20542078
$content = str_replace('{use_socket}', $use_socket, $content);
2079+
2080+
// SSL in apps vhost is off by default. Might change later.
2081+
$content = str_replace('{ssl_on}', 'off', $content);
2082+
$content = str_replace('{ssl_comment}', '#', $content);
20552083

20562084
wf($vhost_conf_dir.'/apps.vhost', $content);
20572085

0 commit comments

Comments
 (0)