diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php index b3887cbd235513c726f07ba3315822359ac7d2b4..73e062b9783c057f01c88d71e07944ff1875d15d 100644 --- a/install/dist/lib/debian60.lib.php +++ b/install/dist/lib/debian60.lib.php @@ -91,6 +91,7 @@ class installer extends installer_base { } else { copy('tpl/debian6_dovecot2.conf.master', $config_dir.'/'.$configfile); } + replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0); } 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); @@ -115,6 +116,9 @@ class installer extends installer_base { chmod($config_dir.'/'.$configfile, 0600); chown($config_dir.'/'.$configfile, 'root'); chgrp($config_dir.'/'.$configfile, 'root'); + + // Dovecot shall ignore mounts in website directory + exec("doveadm mount add '/var/www/*' ignore"); } diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 666d31573dd4d700b708f5af3ffaa0bd8838a47e..a994b66ca1e5f2373ca7cc67c7e808cdd8df9a2b 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -448,6 +448,9 @@ class installer_dist extends installer_base { exec("chmod 600 $config_dir/$configfile"); exec("chown root:root $config_dir/$configfile"); + + // Dovecot shall ignore mounts in website directory + exec("doveadm mount add '/var/www/*' ignore"); } diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 5c0af8ffa0246567ed16532d81553ac146b0fe67..a4782d72d9f970758e55b6093b1269a7b4ae8758 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -483,6 +483,9 @@ class installer_dist extends installer_base { exec("chmod 600 $config_dir/$configfile"); exec("chown root:root $config_dir/$configfile"); + + // Dovecot shall ignore mounts in website directory + exec("doveadm mount add '/srv/www/*' ignore"); } diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 60ad43bc624a17dc085600cd20d753563e9d654a..6aa4929299013dccd55f8f3bf7fcd0da59b03083 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -996,6 +996,9 @@ class installer_base { chmod($config_dir.'/'.$configfile, 0600); chown($config_dir.'/'.$configfile, 'root'); chgrp($config_dir.'/'.$configfile, 'root'); + + // Dovecot shall ignore mounts in website directory + exec("doveadm mount add '/var/www/*' ignore"); }