From 0832c839f8141f9f52ce3328db3da2607a394eae Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 20 Mar 2014 05:02:07 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 install/tpl/apache_ispconfig.conf.master |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index 6873e53..db6cb40 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -104,7 +104,9 @@
 		</tmpl_if>
 </Directory>
 
+<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
 Alias /awstats-icon "/usr/share/awstats/icon"
+</tmpl_if>
 
 NameVirtualHost *:80
 NameVirtualHost *:443

--
Gitblit v1.9.1