From b79f6ca284856d5ad1e260540b418b7eb634bc16 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Sun, 19 Oct 2014 16:15:00 +0200 Subject: [PATCH] Improved dovecot version detection in installer for Fedora and CentOS. --- install/dist/lib/fedora.lib.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 5771bbaead..fdfd1a9685 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -416,18 +416,19 @@ class installer_dist extends installer_base { //* Get the dovecot version exec('dovecot --version', $tmp); - $parts = explode('.', trim($tmp[0])); - $dovecot_version = $parts[0]; + $dovecot_version = $tmp[0]; unset($tmp); - unset($parts); //* Copy dovecot configuration file - if($dovecot_version == 2) { + if(version_compare($dovecot_version,2) >= 0) { if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot2.conf.master')) { copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot2.conf.master', $config_dir.'/'.$configfile); } else { copy('tpl/fedora_dovecot2.conf.master', $config_dir.'/'.$configfile); } + if(version_compare($dovecot_version,2.1) < 0) { + removeLine($config_dir.'/'.$configfile, 'ssl_protocols ='); + } } else { if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot.conf.master')) { copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot.conf.master', $config_dir.'/'.$configfile); -- GitLab