From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 26 Nov 2012 10:19:51 +0000 (+0100)
Subject: apache: Allow accessing sarg reports for admins.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f87161948c0caad91720b4057201cf47143c6140;p=people%2Fteissler%2Fipfire-2.x.git

apache: Allow accessing sarg reports for admins.
---

diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
index 7b1083254..cc3cb1d90 100644
--- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf
+++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
@@ -85,4 +85,14 @@
 		 Order deny,allow
 		 Allow from all
 	</Directory>
+
+    Alias /proxy-reports/ /var/log/sarg/
+    <Directory /var/log/sarg>
+        AllowOverride None
+        Options None
+        AuthName "IPFire - Restricted"
+        AuthType Basic
+        AuthUserFile /var/ipfire/auth/users
+        Require user admin
+    </Directory>
 </VirtualHost>
diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files
index d4067337e..297f276bd 100644
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -1,3 +1,4 @@
+etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
 etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat
diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh
index 729e764f0..fca72115e 100644
--- a/config/rootfiles/core/65/update.sh
+++ b/config/rootfiles/core/65/update.sh
@@ -52,6 +52,9 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 # Re-read crontab.
 fcrontab -z &>/dev/null
 
+# Reload apache configuration.
+/etc/init.d/apache reload &>/dev/null
+
 #Rebuild module dep's
 #arch=`uname -m`
 #if [ ${arch::3} == "arm" ]; then