Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into ...

Falko Timme

2014-05-03 89629678be073dcbda03e6364e40a43273893c09

Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

 install/dist/lib/fedora.lib.php

@@ -438,6 +438,8 @@
            copy("$config_dir/$configfile", "$config_dir/$configfile~");
            exec("chmod 400 $config_dir/$configfile~");
        }
		
        if(!@file_exists('/etc/dovecot-sql.conf')) exec('ln -s /etc/dovecot/dovecot-sql.conf /etc/dovecot-sql.conf');

        $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot-sql.conf.master', "tpl/fedora_dovecot-sql.conf.master");
        $content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
@@ -450,7 +452,7 @@
        exec("chown root:root $config_dir/$configfile");
        
        // Dovecot shall ignore mounts in website directory
        exec("doveadm mount add '/var/www/*' ignore");
        if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");

    }