Am Pakfire weitergearbeitet.

[people/pmueller/ipfire-2.x.git] / lfs / squidguard

diff --git a/lfs/squidguard b/lfs/squidguard
index 9f24478f90b1c7c8b297944f5aa05902416b685f..8a53878d9588865a6b5f9eae59e74dbdc471e20a 100644 (file)
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -78,11 +78,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \
                --with-sg-logdir=/var/log/squidGuard --with-sg-dbhome=/var/lib/squidguard \
                --with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
        # URL-Filter
-       -mkdir /etc/squidGuard /home/httpd/html/repository
+       -mkdir /etc/squidGuard /srv/web/ipfire/html/repository
        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
@@ -94,12 +94,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -f  $(DIR_CONF)/urlfilter/autoupdate.pl /var/ipfire/urlfilter/bin/autoupdate.pl
        chmod 755 /var/ipfire/urlfilter/bin/autoupdate.pl
        echo "1.7.1" > /var/ipfire/urlfilter/version
+       
+       # Wrapper
+       cp -f  $(DIR_CONF)/urlfilter/redirect_wrapper /usr/sbin
+       chmod 755 /usr/sbin/redirect_wrapper
 
        /bin/tar --no-same-owner -xzf $(DIR_CONF)/urlfilter/blacklists.tar.gz -C /var/ipfire/urlfilter
        /usr/bin/perl $(DIR_CONF)/urlfilter/makeconf.pl
        chown -R nobody:nobody /var/ipfire/urlfilter
-       chown -R nobody:nobody /home/httpd/html/images/urlfilter
-       chown -R nobody:nobody /home/httpd/html/repository
+       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 squid:squid /var/log/squidGuard
 
        @rm -rf $(DIR_APP)