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 7b10832549be7af7a41d286d21007fb402cf7633..cc3cb1d90707f0c834b370b2303f6ac672857591 100644 (file)
--- 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 d4067337e7f1a18f54f89e98a40d37b6b8333f81..297f276bd9a41875bb7015e33aa4b39a2b31deac 100644 (file)
--- 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 729e764f0a96b3f3daf0e7c682b4c6fb9de50de9..fca72115e16a42a495df625813ccf7e53b6dea14 100644 (file)
--- 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