From 159f582011a437d284136928c2446fc62863b2cc Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 23 Oct 2020 09:44:45 +0200
Subject: [PATCH] Add Alias to make sure a global /mail alias does not
 interfere with ISPConfig UI

---
 install/dist/tpl/gentoo/apache_ispconfig.vhost.master | 2 ++
 install/tpl/apache_ispconfig.vhost.master             | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/install/dist/tpl/gentoo/apache_ispconfig.vhost.master b/install/dist/tpl/gentoo/apache_ispconfig.vhost.master
index 20e7b3b684..01b3b383d5 100644
--- a/install/dist/tpl/gentoo/apache_ispconfig.vhost.master
+++ b/install/dist/tpl/gentoo/apache_ispconfig.vhost.master
@@ -12,6 +12,8 @@
 <VirtualHost _default_:{vhost_port}>
   ServerAdmin webmaster@localhost
 
+  Alias /mail /var/www/ispconfig/mail
+  
   <IfModule mod_fcgid.c>
     DocumentRoot /var/www/ispconfig/
     SuexecUserGroup ispconfig ispconfig
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index cc177f5c48..0d12694f7a 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -9,6 +9,8 @@ NameVirtualHost *:<tmpl_var name="vhost_port">
 <VirtualHost _default_:<tmpl_var name="vhost_port">>
   ServerAdmin webmaster@localhost
 
+  Alias /mail /var/www/ispconfig/mail
+
   <Directory /var/www/ispconfig/>
     <FilesMatch "\.ph(p3?|tml)$">
       SetHandler None
-- 
GitLab