Skip to content

Commit e4271e1

Browse files
florian030florian030
committed
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
2 parents ae07621 + 535bbac commit e4271e1

File tree

211 files changed

+1162
-542
lines changed

Some content is hidden

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

211 files changed

+1162
-542
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.DS_Store
22
/nbproject/private/
33
.phplint-cache
4+
*.swp

‎install/dist/lib/fedora.lib.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ function configure_postfix($options = '')
6666
//* mysql-virtual_alias_domains.cf
6767
$this->process_postfix_config('mysql-virtual_alias_domains.cf');
6868

69+
//* mysql-virtual_alias_maps.cf
70+
$this->process_postfix_config('mysql-virtual_alias_maps.cf');
71+
6972
//* mysql-virtual_mailboxes.cf
7073
$this->process_postfix_config('mysql-virtual_mailboxes.cf');
7174

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ function configure_postfix($options = '')
6666
//* mysql-virtual_alias_domains.cf
6767
$this->process_postfix_config('mysql-virtual_alias_domains.cf');
6868

69+
//* mysql-virtual_alias_maps.cf
70+
$this->process_postfix_config('mysql-virtual_alias_maps.cf');
71+
6972
//* mysql-virtual_mailboxes.cf
7073
$this->process_postfix_config('mysql-virtual_mailboxes.cf');
7174

‎install/lib/installer_base.lib.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -976,6 +976,9 @@ public function configure_postfix($options = '') {
976976
//* mysql-virtual_alias_domains.cf
977977
$this->process_postfix_config('mysql-virtual_alias_domains.cf');
978978

979+
//* mysql-virtual_alias_maps.cf
980+
$this->process_postfix_config('mysql-virtual_alias_maps.cf');
981+
979982
//* mysql-virtual_mailboxes.cf
980983
$this->process_postfix_config('mysql-virtual_mailboxes.cf');
981984

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,8 @@ ALTER TABLE `client` CHANGE `id_rsa` `id_rsa` TEXT CHARACTER SET utf8 COLLATE ut
6565

6666
ALTER TABLE `directive_snippets` ADD `update_sites` ENUM('y','n') NOT NULL DEFAULT 'n' ;
6767

68+
-- Add DNSSEC Algorithm setting
69+
ALTER TABLE `dns_soa` ADD `dnssec_algo` SET('NSEC3RSASHA1','ECDSAP256SHA256') NULL DEFAULT NULL AFTER `dnssec_wanted`;
70+
UPDATE `dns_soa` SET `dnssec_algo` = 'NSEC3RSASHA1' WHERE `dnssec_algo` IS NULL AND dnssec_initialized = 'Y';
71+
UPDATE `dns_soa` SET `dnssec_algo` = 'ECDSAP256SHA256' WHERE `dnssec_algo` IS NULL AND dnssec_initialized = 'N';
72+
ALTER TABLE `dns_soa` CHANGE `dnssec_algo` `dnssec_algo` SET('NSEC3RSASHA1','ECDSAP256SHA256') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'ECDSAP256SHA256';

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,7 @@ CREATE TABLE `dns_soa` (
626626
`update_acl` varchar(255) default NULL,
627627
`dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N',
628628
`dnssec_wanted` ENUM('Y','N') NOT NULL DEFAULT 'N',
629+
`dnssec_algo` SET('NSEC3RSASHA1','ECDSAP256SHA256') NOT NULL DEFAULT 'ECDSAP256SHA256',
629630
`dnssec_last_signed` BIGINT NOT NULL DEFAULT '0',
630631
`dnssec_info` TEXT NULL,
631632
PRIMARY KEY (`id`),
@@ -2501,7 +2502,7 @@ INSERT INTO `country` (`iso`, `name`, `printable_name`, `iso3`, `numcode`, `eu`)
25012502
-- Dumping data for table `dns_template`
25022503
--
25032504

2504-
INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM,DNSSEC', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=3600\nttl=3600\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600\nTXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600', 'y');
2505+
INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM,DNSSEC', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=3600\nttl=3600\ndnssec_algo=ECDSAP256SHA256\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600\nTXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600', 'y');
25052506

25062507

25072508
-- --------------------------------------------------------

‎install/tpl/apache_ispconfig.vhost.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ NameVirtualHost *:<tmpl_var name="vhost_port">
7070
# SSL Configuration
7171
<tmpl_var name="ssl_comment">SSLEngine On
7272
<tmpl_if name='apache_version' op='>=' value='2.3.16' format='version'>
73-
<tmpl_var name="ssl_comment">SSLProtocol All -SSLv3
73+
<tmpl_var name="ssl_comment">SSLProtocol All -SSLv3 -TLSv1 -TLSv1.1
7474
<tmpl_else>
7575
<tmpl_var name="ssl_comment">SSLProtocol All -SSLv2 -SSLv3
7676
</tmpl_if>
7777
<tmpl_var name="ssl_comment">SSLCertificateFile /usr/local/ispconfig/interface/ssl/ispserver.crt
7878
<tmpl_var name="ssl_comment">SSLCertificateKeyFile /usr/local/ispconfig/interface/ssl/ispserver.key
7979
<tmpl_var name="ssl_bundle_comment">SSLCACertificateFile /usr/local/ispconfig/interface/ssl/ispserver.bundle
8080

81-
<tmpl_var name="ssl_comment">SSLCipherSuite ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
81+
<tmpl_var name="ssl_comment">SSLCipherSuite 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
8282
<tmpl_var name="ssl_comment">SSLHonorCipherOrder On
8383
<tmpl_if name='apache_version' op='>=' value='2.4.3' format='version'>
8484
<tmpl_var name="ssl_comment">SSLCompression Off

‎install/tpl/debian6_dovecot2.conf.master‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ mail_privileged_group = vmail
77
ssl_cert = </etc/postfix/smtpd.cert
88
ssl_key = </etc/postfix/smtpd.key
99
ssl_dh = </etc/dovecot/dh.pem
10-
ssl_protocols = !SSLv2 !SSLv3
11-
ssl_min_protocol = TLSv1
10+
ssl_protocols = !SSLv2 !SSLv3 !TLSv1 !TLSv1.1
11+
ssl_min_protocol = TLSv1.2
12+
ssl_cipher_list = 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
13+
ssl_prefer_server_ciphers = no
1214
auth_verbose = yes
1315
mail_max_userip_connections = 100
1416
mail_plugins = quota

‎install/tpl/debian_dovecot2.conf.master‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ mail_privileged_group = vmail
77
postmaster_address = postmaster@example.com
88
ssl_cert = </etc/postfix/smtpd.cert
99
ssl_key = </etc/postfix/smtpd.key
10-
ssl_protocols = !SSLv2 !SSLv3
10+
ssl_min_protocol = TLSv1.2
11+
ssl_cipher_list = 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
12+
ssl_prefer_server_ciphers = no
1113
auth_verbose = yes
1214
mail_max_userip_connections = 100
1315
mail_plugins = $mail_plugins quota

‎install/tpl/debian_postfix.conf.master‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
alias_maps = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases
22
alias_database = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases
33
virtual_alias_domains = proxy:mysql:{config_dir}/mysql-virtual_alias_domains.cf
4-
virtual_alias_maps = hash:/var/lib/mailman/data/virtual-mailman, proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_alias_domains.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
4+
virtual_alias_maps = hash:/var/lib/mailman/data/virtual-mailman, proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_alias_maps.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
55
virtual_mailbox_domains = proxy:mysql:{config_dir}/mysql-virtual_domains.cf
66
virtual_mailbox_maps = proxy:mysql:{config_dir}/mysql-virtual_mailboxes.cf
77
virtual_mailbox_base = {vmail_mailbox_base}
@@ -14,7 +14,7 @@ smtpd_sasl_auth_enable = yes
1414
broken_sasl_auth_clients = yes
1515
smtpd_sasl_authenticated_header = yes
1616
smtpd_restriction_classes = greylisting
17-
greylisting = check_policy_service inet:127.0.0.1:10023
17+
greylisting = check_policy_service inet:127.0.0.1:10023
1818
smtpd_recipient_restrictions = permit_mynetworks, reject_unknown_recipient_domain, check_recipient_access proxy:mysql:{config_dir}/mysql-verify_recipients.cf, permit_sasl_authenticated, reject_non_fqdn_recipient, reject_unauth_destination, check_recipient_access proxy:mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}{greylisting}, check_policy_service unix:private/quota-status
1919
smtpd_use_tls = yes
2020
smtpd_tls_security_level = may
@@ -39,10 +39,13 @@ nested_header_checks = regexp:{config_dir}/nested_header_checks
3939
body_checks = regexp:{config_dir}/body_checks
4040
owner_request_special = no
4141
smtp_tls_security_level = may
42-
smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3
43-
smtpd_tls_protocols = !SSLv2,!SSLv3
44-
smtp_tls_protocols = !SSLv2,!SSLv3
42+
smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3, !TLSv1, !TLSv1.1
43+
smtpd_tls_protocols = !SSLv2,!SSLv3, !TLSv1, !TLSv1.1
44+
smtp_tls_protocols = !SSLv2,!SSLv3, !TLSv1, !TLSv1.1
4545
smtpd_tls_exclude_ciphers = RC4, aNULL
4646
smtp_tls_exclude_ciphers = RC4, aNULL
47+
smtpd_tls_mandatory_ciphers = medium
48+
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
49+
tls_preempt_cipherlist = no
4750
# needed for postfix < 3.3 when using reject_unverified_recipient (lmtp):
4851
enable_original_recipient = yes

0 commit comments

Comments
 (0)