Skip to content

Commit 5cbfd76

Browse files
author
Till Brehm
committed
Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop
2 parents 709789a + 92fc373 commit 5cbfd76

File tree

13 files changed

+34
-12
lines changed

13 files changed

+34
-12
lines changed

‎docs/autoinstall_samples/autoinstall.conf_sample.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
$autoinstall['ispconfig_port'] = '8080'; // default: 8080
1414
$autoinstall['ispconfig_use_ssl'] = 'y'; // y (default), n
1515
$autoinstall['ispconfig_admin_password'] = 'admin'; // default: admin
16+
$autoinstall['create_ssl_server_certs'] = 'y';
17+
$autoinstall['ignore_hostname_dns'] = 'n';
18+
$autoinstall['ispconfig_postfix_ssl_symlink'] = 'y';
19+
$autoinstall['ispconfig_pureftpd_ssl_symlink'] = 'y';
1620

1721
/* SSL Settings */
1822
$autoinstall['ssl_cert_country'] = 'AU';
@@ -52,6 +56,10 @@
5256
$autoupdate['ispconfig_port'] = '8080'; // default: 8080
5357
$autoupdate['create_new_ispconfig_ssl_cert'] = 'no'; // no (default), yes
5458
$autoupdate['reconfigure_crontab'] = 'yes'; // yes (default), no
59+
$autoupdate['create_ssl_server_certs'] = 'y';
60+
$autoupdate['ignore_hostname_dns'] = 'n';
61+
$autoupdate['ispconfig_postfix_ssl_symlink'] = 'y';
62+
$autoupdate['ispconfig_pureftpd_ssl_symlink'] = 'y';
5563

5664
/* These are for service-detection (defaulting to old behaviour where alle changes were automatically accepted) */
5765
$autoupdate['svc_detect_change_mail_server'] = 'yes'; // yes (default), no

‎docs/autoinstall_samples/autoinstall.ini.sample‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ http_server=apache
1212
ispconfig_port=8080
1313
ispconfig_use_ssl=y
1414
ispconfig_admin_password=admin
15+
create_ssl_server_certs=y
16+
ignore_hostname_dns=n
17+
ispconfig_postfix_ssl_symlink=y
18+
ispconfig_pureftpd_ssl_symlink=y
1519

1620
[ssl_cert]
1721
ssl_cert_country=AU
@@ -51,6 +55,10 @@ reconfigure_services=yes
5155
ispconfig_port=8080
5256
create_new_ispconfig_ssl_cert=no
5357
reconfigure_crontab=yes
58+
create_ssl_server_certs=y
59+
ignore_hostname_dns=n
60+
ispconfig_postfix_ssl_symlink=y
61+
ispconfig_pureftpd_ssl_symlink=y
5462

5563
; These are for service-detection (defaulting to old behaviour where alle changes were automatically accepted)
5664
svc_detect_change_mail_server=yes

‎install/install.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@
582582

583583
// Create SSL certs for non-webserver(s)?
584584
if(!file_exists('/usr/local/ispconfig/interface/ssl/ispserver.crt')) {
585-
if(!$issue_tried && strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y')) == 'y') {
585+
if(!$issue_tried && strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y','create_ssl_server_certs')) == 'y') {
586586
$inst->make_ispconfig_ssl_cert();
587587
}
588588
} else {

‎install/lib/installer_base.lib.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,9 @@ public function add_database_server_record() {
391391
}
392392
}
393393

394+
// preserve needed values in $conf (should just array_merge $tpl_ini_array into $conf?)
395+
$conf['mail']['content_filter'] = $tpl_ini_array['mail']['content_filter'];
396+
394397
$server_ini_content = array_to_ini($tpl_ini_array);
395398

396399
$mail_server_enabled = ($conf['services']['mail'])?1:0;
@@ -1475,7 +1478,7 @@ public function configure_dovecot() {
14751478
}
14761479
$new_options[] = $value;
14771480
}
1478-
if ($configure_lmtp) {
1481+
if ($configure_lmtp && $conf['mail']['content_filter'] === 'amavisd') {
14791482
for ($i = 0; isset($new_options[$i]); $i++) {
14801483
if ($new_options[$i] == 'reject_unlisted_recipient') {
14811484
array_splice($new_options, $i+1, 0, array("check_recipient_access proxy:mysql:${quoted_config_dir}/mysql-verify_recipients.cf"));
@@ -3043,7 +3046,7 @@ public function make_ispconfig_ssl_cert() {
30433046
exec("cat $ssl_key_file $ssl_crt_file > $ssl_pem_file; chmod 600 $ssl_pem_file");
30443047

30453048
// Extend LE SSL certs to postfix
3046-
if ($conf['postfix']['installed'] == true && strtolower($this->simple_query('Symlink ISPConfig SSL certs to Postfix?', array('y', 'n'), 'y')) == 'y') {
3049+
if ($conf['postfix']['installed'] == true && strtolower($this->simple_query('Symlink ISPConfig SSL certs to Postfix?', array('y', 'n'), 'y','ispconfig_postfix_ssl_symlink')) == 'y') {
30473050

30483051
// Define folder, file(s)
30493052
$cf = $conf['postfix'];
@@ -3062,7 +3065,7 @@ public function make_ispconfig_ssl_cert() {
30623065
}
30633066

30643067
// Extend LE SSL certs to pureftpd
3065-
if ($conf['pureftpd']['installed'] == true && strtolower($this->simple_query('Symlink ISPConfig SSL certs to Pure-FTPd? Creating dhparam file may take some time.', array('y', 'n'), 'y')) == 'y') {
3068+
if ($conf['pureftpd']['installed'] == true && strtolower($this->simple_query('Symlink ISPConfig SSL certs to Pure-FTPd? Creating dhparam file may take some time.', array('y', 'n'), 'y','ispconfig_pureftpd_ssl_symlink')) == 'y') {
30663069

30673070
// Define folder, file(s)
30683071
$pureftpd_dir = '/etc/ssl/private';

‎install/tpl/debian_postfix.conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,6 @@ smtp_tls_exclude_ciphers = RC4, aNULL
4949
smtpd_tls_mandatory_ciphers = medium
5050
tls_medium_cipherlist = ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
5151
tls_preempt_cipherlist = no
52+
address_verify_negative_refresh_time=60s
5253
# needed for postfix < 3.3 when using reject_unverified_recipient (lmtp):
5354
enable_original_recipient = yes

‎install/tpl/fedora_postfix.conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,6 @@ smtp_tls_exclude_ciphers = RC4, aNULL
4545
smtpd_tls_mandatory_ciphers = medium
4646
tls_medium_cipherlist = ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
4747
tls_preempt_cipherlist = no
48+
address_verify_negative_refresh_time=60s
4849
# needed for postfix < 3.3 when using reject_unverified_recipient (lmtp):
4950
enable_original_recipient = yes

‎install/tpl/gentoo_postfix.conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@ smtp_tls_exclude_ciphers = RC4, aNULL
4444
smtpd_tls_mandatory_ciphers = medium
4545
tls_medium_cipherlist = ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
4646
tls_preempt_cipherlist = no
47+
address_verify_negative_refresh_time=60s
4748
# needed for postfix < 3.3 when using reject_unverified_recipient (lmtp):
4849
enable_original_recipient = yes

‎install/tpl/opensuse_postfix.conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,6 @@ smtp_tls_exclude_ciphers = RC4, aNULL
4747
smtpd_tls_mandatory_ciphers = medium
4848
tls_medium_cipherlist = ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
4949
tls_preempt_cipherlist = no
50+
address_verify_negative_refresh_time=60s
5051
# needed for postfix < 3.3 when using reject_unverified_recipient (lmtp):
5152
enable_original_recipient = yes

‎install/update.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@
548548

549549
// Create SSL certs for non-webserver(s)?
550550
if(!file_exists('/usr/local/ispconfig/interface/ssl/ispserver.crt')) {
551-
if(!$issue_tried && strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y')) == 'y') {
551+
if(!$issue_tried && strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y','create_ssl_server_certs')) == 'y') {
552552
$inst->make_ispconfig_ssl_cert();
553553
}
554554
} else {

‎interface/web/themes/default/assets/javascripts/ispconfig.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ var ISPConfig = {
176176
ISPConfig.onAfterContentLoad(target, $('#'+formname).serialize());
177177
ISPConfig.pageFormChanged = false;
178178
}
179-
clearTimeout(dataLogTimer);
179+
clearTimeout(ISPConfig.dataLogTimer);
180180
ISPConfig.dataLogNotification();
181181
ISPConfig.hideLoadIndicator();
182182
},
@@ -285,7 +285,7 @@ var ISPConfig = {
285285
ISPConfig.onAfterContentLoad(pagename, (params ? params : null));
286286
ISPConfig.pageFormChanged = false;
287287
}
288-
clearTimeout(dataLogTimer); // clear running dataLogTimer
288+
clearTimeout(ISPConfig.dataLogTimer); // clear running dataLogTimer
289289
ISPConfig.dataLogNotification();
290290
ISPConfig.hideLoadIndicator();
291291
},
@@ -514,12 +514,12 @@ var ISPConfig = {
514514
$('.modal-body').html(dataLogItems.join(""));
515515
$('.notification_text').text(data['count']);
516516
$('.notification').css('display','');
517-
dataLogTimer = setTimeout( function() { ISPConfig.dataLogNotification(); }, 2000 );
517+
ISPConfig.dataLogTimer = setTimeout( function() { ISPConfig.dataLogNotification(); }, 2000 );
518518
} else {
519519
$('.notification').css('display','none');
520520
$('.modal-body').html('');
521521
$('#datalogModal').modal('hide');
522-
dataLogTimer = setTimeout( function() { ISPConfig.dataLogNotification(); }, 5000 );
522+
ISPConfig.dataLogTimer = setTimeout( function() { ISPConfig.dataLogNotification(); }, 5000 );
523523
}
524524
},
525525
error: function() {

0 commit comments

Comments
 (0)