Till Brehm
2014-10-19 b79f6ca284856d5ad1e260540b418b7eb634bc16
Improved dovecot version detection in installer for Fedora and CentOS.
1 files modified
9 ■■■■■ changed files
install/dist/lib/fedora.lib.php 9 ●●●●● patch | view | raw | blame | history
install/dist/lib/fedora.lib.php
@@ -416,18 +416,19 @@
        //* 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);