Fixes for exim and divecot work

install/rpm/exim/exim.conf

@@ -312,7 +312,7 @@ catchall:
   data = ${extract{1}{:}{${lookup{*@${lookup{$domain}dsearch{/etc/exim/domains/}}}lsearch{/etc/exim/domains/${lookup{${lookup{$domain}dsearch{/etc/exim/domains/}}}dsearch{/etc/exim/domains/}}/aliases}}}}
   file_transport = local_delivery
   redirect_router = dnslookup
-  condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{false}{true}}
+  condition = ${lookup{$local_part@$domain}lsearch{/etc/exim/domains/${lookup{$domain}dsearch{/etc/exim/domains/}}/aliases}{false}{true}}
 
 terminate_alias:
   driver = accept

install/rpm/templates/mail/httpd/default.stpl

@@ -5,6 +5,9 @@
     Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
     #SuexecUserGroup %user% %group%
 
+    DirectoryIndex index.php index.html
+
+
     SSLEngine on
     SSLVerifyClient none
     SSLCertificateFile         %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.crt
@@ -48,4 +51,4 @@
 
     IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_*
 
-</VirtualHost>
+</VirtualHost>

install/rpm/templates/mail/httpd/default.tpl

@@ -5,6 +5,8 @@
     Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
     #SuexecUserGroup %user% %group%
 
+    DirectoryIndex index.php index.html
+
     IncludeOptional %home%/%user%/conf/mail/%root_domain%/apache2.forcessl.conf*
 
     <Directory "/usr/share/tinymce/www/">
@@ -45,4 +47,4 @@
 
     IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*
 
-</VirtualHost>
+</VirtualHost>

install/rpm/templates/mail/httpd/disabled.stpl

@@ -3,10 +3,11 @@ ServerName %domain_idn%
 ServerAlias %alias_idn%
 DocumentRoot /var/www/html/
 Alias /error/ /var/www/document_errors/
+DirectoryIndex index.php index.html
 
 SSLEngine on
 SSLVerifyClient none
 SSLCertificateFile         %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.crt
 SSLCertificateKeyFile      %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.key
 
-</VirtualHost>
+</VirtualHost>

install/rpm/templates/mail/httpd/disabled.tpl

@@ -4,4 +4,6 @@
     DocumentRoot /var/www/html/
     Alias /error/ /var/www/document_errors/
     #SuexecUserGroup %user% %group%
-</VirtualHost>
+    DirectoryIndex index.php index.html
+
+</VirtualHost>

install/rpm/templates/mail/httpd/rainloop.stpl

@@ -4,6 +4,7 @@ ServerAlias %alias_idn%
 Alias / /var/lib/rainloop/
 Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
 #SuexecUserGroup %user% %group%
+DirectoryIndex index.php index.html
 
 SSLEngine on
 SSLVerifyClient none
@@ -28,4 +29,4 @@ SSLCertificateKeyFile      %home%/%user%/conf/mail/%root_domain%/ssl/%root_domai
 
 IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_*
 
-</VirtualHost>
+</VirtualHost>

install/rpm/templates/mail/httpd/rainloop.tpl

@@ -5,6 +5,8 @@
     Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
     #SuexecUserGroup %user% %group%
 
+    DirectoryIndex index.php index.html
+
     IncludeOptional %home%/%user%/conf/mail/%root_domain%/apache2.forcessl.conf*
 
     <Directory /var/lib/rainloop/>
@@ -22,4 +24,4 @@
             AllowOverride None
     </Directory>
     IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*
-</VirtualHost>
+</VirtualHost>

install/rpm/templates/mail/httpd/snappymail.stpl

@@ -5,6 +5,8 @@ Alias / /var/lib/snappymail/
 Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
 #SuexecUserGroup %user% %group%
 
+DirectoryIndex index.php index.html
+
 SSLEngine on
 SSLVerifyClient none
 SSLCertificateFile         %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.crt

install/rpm/templates/mail/httpd/snappymail.tpl

@@ -5,6 +5,8 @@
     Alias /error/ %home%/%user%/web/%root_domain%/document_errors/
     #SuexecUserGroup %user% %group%
 
+    DirectoryIndex index.php index.html
+
     IncludeOptional %home%/%user%/conf/mail/%root_domain%/apache2.forcessl.conf*
 
     <Directory /var/lib/snappymail/>