Fixed url filter repository for local redirects.

This fixes bug #0000613

diff --git a/config/httpd/vhosts.d/ipfire-interface.conf b/config/httpd/vhosts.d/ipfire-interface.conf
index bf55b2b37ce9a006599606dfd6cd10b3000c935c..b55b80fcb96f0eaf6885cd7b7a5e38624dfa8d9d 100644 (file)
--- a/config/httpd/vhosts.d/ipfire-interface.conf
+++ b/config/httpd/vhosts.d/ipfire-interface.conf
@@ -51,11 +51,18 @@
         Require user dial admin
     </Directory>
     Alias /updatecache/ /var/updatecache/
-<Directory /var/updatecache>
-     Options ExecCGI
-     AllowOverride None
-     Order deny,allow
-     Allow from all
-</Directory>
+       <Directory /var/updatecache>
+                Options ExecCGI
+                AllowOverride None
+                Order deny,allow
+                Allow from all
+       </Directory>
+    Alias /repository/ /var/urlrepo/
+       <Directory /var/urlrepo>
+                Options ExecCGI
+                AllowOverride None
+                Order deny,allow
+                Allow from all
+       </Directory>
 
 </VirtualHost>

diff --git a/config/rootfiles/common/squidguard b/config/rootfiles/common/squidguard
index 8e8509c1defb76766b29b00dc1ea1a99e06c8129..a6bab0c181b925284799f4c8e9a0b0d0ab6b43d3 100644 (file)
--- a/config/rootfiles/common/squidguard
+++ b/config/rootfiles/common/squidguard
@@ -1,6 +1,5 @@
 #etc/squidGuard
 etc/squidGuard/squidGuard.conf
-srv/web/ipfire/html/repository
 usr/bin/squidGuard
 usr/sbin/redirect_wrapper
 #usr/squidGuard
@@ -80,3 +79,5 @@ var/ipfire/urlfilter/version
 var/lib/squidguard
 #var/log/squidGuard
 var/log/squidGuard/squidGuard.log
+var/urlrepo
+

diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index 2d180e29292a5eedcd1a99e921351f4c506cc704..6e99397ec0c40ce40c0375d7b7b2e95b69d155a5 100644 (file)
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -59,7 +59,7 @@ my $tcfile = "${General::swroot}/urlfilter/timeconst";
 my $uqfile = "${General::swroot}/urlfilter/userquota";
 my $dbdir = "${General::swroot}/urlfilter/blacklists";
 my $editdir = "${General::swroot}/urlfilter/editor";
-my $repository = "/home/httpd/html/repository";
+my $repository = "/var/urlrepo";
 my $hintcolour = '#FFFFCC';
 
 my $sourceurlfile = "${General::swroot}/urlfilter/autoupdate/autoupdate.urls";

diff --git a/lfs/squidguard b/lfs/squidguard
index 5b2656ca95b9ba4fe7ca1d1f2a2263c72f1c06ab..a5dd7b9cbfdbd1a7d165f4a5719ab11b310efa28 100644 (file)
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make install
 
        # URL-Filter
-       -mkdir /etc/squidGuard /srv/web/ipfire/html/repository
+       -mkdir /etc/squidGuard /var/urlrepo
        cp -f  $(DIR_CONF)/urlfilter/autoupdate.urls /var/ipfire/urlfilter/autoupdate/autoupdate.urls
        ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.daily
        ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.weekly
@@ -102,7 +102,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown -R nobody:nobody /var/ipfire/urlfilter
        chmod 755 /srv/web/ipfire/html/images/urlfilter
        chmod 644 /srv/web/ipfire/html/images/urlfilter/*
-       chown -R nobody:nobody /srv/web/ipfire/html/repository
+       chown -R nobody:nobody /var/urlrepo
        chown -R squid:squid /var/log/squidGuard
 
        @rm -rf $(DIR_APP)