Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Webslice
ISPConfig 3
Commits
eae23686
Commit
eae23686
authored
Jul 15, 2019
by
Till Brehm
Browse files
Fixed
#5340
Debian 10 warnings about deprecated dovecot config and missing dh params file.
parent
7aa9c37d
Changes
2
Show whitespace changes
Inline
Side-by-side
install/dist/lib/debian60.lib.php
View file @
eae23686
...
...
@@ -116,6 +116,32 @@ class installer extends installer_base {
file_put_contents
(
$config_dir
.
'/'
.
$configfile
,
$content
);
unset
(
$content
);
}
if
(
version_compare
(
$dovecot_version
,
2.3
)
>=
0
)
{
// Remove deprecated setting(s)
removeLine
(
$config_dir
.
'/'
.
$configfile
,
'ssl_protocols ='
);
// Check if we have a dhparams file and if not, create it
if
(
!
file_exists
(
'/etc/dovecot/dh.pem'
))
{
swriteln
(
'Creating new DHParams file, this takes several minutes. Do not interrupt the script.'
);
if
(
file_exists
(
'/var/lib/dovecot/ssl-parameters.dat'
))
{
// convert existing ssl parameters file
$command
=
'dd if=/var/lib/dovecot/ssl-parameters.dat bs=1 skip=88 | openssl dhparam -inform der > /etc/dovecot/dh.pem'
;
caselog
(
$command
.
' &> /dev/null'
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
}
else
{
/*
Create a new dhparams file. We use 2048 bit only as it simply takes too long
on smaller systems to generate a 4096 bit dh file (> 30 minutes). If you need
a 4096 bit file, create it manually before you install ISPConfig
*/
$command
=
'openssl dhparam -out /etc/dovecot/dh.pem 2048'
;
caselog
(
$command
.
' &> /dev/null'
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
}
}
}
else
{
// remove settings which are not supported in Dovecot < 2.3
removeLine
(
$config_dir
.
'/'
.
$configfile
,
'ssl_min_protocol ='
);
removeLine
(
$config_dir
.
'/'
.
$configfile
,
'ssl_dh ='
);
}
}
else
{
if
(
is_file
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/debian6_dovecot.conf.master'
))
{
copy
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/debian6_dovecot.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
...
...
install/tpl/debian6_dovecot2.conf.master
View file @
eae23686
...
...
@@ -6,7 +6,9 @@ log_timestamp = "%Y-%m-%d %H:%M:%S "
mail_privileged_group = vmail
ssl_cert = </etc/postfix/smtpd.cert
ssl_key = </etc/postfix/smtpd.key
ssl_dh = </etc/dovecot/dh.pem
ssl_protocols = !SSLv2 !SSLv3
ssl_min_protocol = TLSv1
mail_max_userip_connections = 100
passdb {
args = /etc/dovecot/dovecot-sql.conf
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment