X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsquidguard;h=39aa7c05855dbc5d255334d9c82815beebe5675d;hp=a6c94b7bc7e45e09a27e391cc5c3946498cc4641;hb=1020ff3069111bf5f7a485111afdea135a26da8f;hpb=60cbd6e755bb6f49ed804821aea49fe94090ba04

diff --git a/lfs/squidguard b/lfs/squidguard
index a6c94b7bc7..39aa7c0585 100644
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -75,10 +75,33 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidGuard-$(VER)-ipfire.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share \
        	--sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man  \
-		--with-sg-config=/var/ipfire/proxy/squidguard.conf \
-		--with-sg-logdir=/var/log/squidguard --with-sg-dbhome=/var/lib/squidguard \
+		--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
+	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
+	ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.monthly
+	cp -f  $(DIR_CONF)/urlfilter/squidGuard.conf /var/ipfire/urlfilter/squidGuard.conf
+	ln -fs /var/ipfire/urlfilter/squidGuard.conf /etc/squidGuard/squidGuard.conf
+	cp -f  $(DIR_CONF)/urlfilter/prebuild.pl /var/ipfire/urlfilter/bin/prebuild.pl
+	chmod 755 /var/ipfire/urlfilter/bin/prebuild.pl
+	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
+
+	/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
+	chmod 755 /home/httpd/html/images/urlfilter
+	chmod 644 /home/httpd/html/images/urlfilter/*
+	chown -R nobody:nobody /home/httpd/html/repository
+	chown -R squid:squid /var/log/squidGuard
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)