X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsquid;h=b91faa13c79e39a6b22a8ef963dfc0d4fbb380ed;hb=d1c279a9562cd3c43d3738d709779a4c75685f13;hp=db4365257959f5b552a9b6bc867e924efff134f1;hpb=4894d8701710c2d70639f7e5b797992e67e3a50f;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/squid b/lfs/squid
index db43652579..b91faa13c7 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -86,14 +86,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	   --enable-ntlm-auth-helpers="SMB" \
 	   --enable-useragent-log \
 	   --enable-referer-log \
-           --enable-snmp \
-	   --with-pthreads --with-dl
+	      --enable-snmp \
+	   --with-pthreads --with-dl \
+	   --with-maxfd="16384"
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
 	rm -f /etc/squid/squid.conf
 	ln -sf /var/ipfire/proxy/squid.conf /etc/squid/squid.conf
+	rm -f /etc/squid/cachemgr.conf
+	ln -sf /var/ipfire/proxy/cachemgr.conf /etc/squid/cachemgr.conf
 	rm -f /etc/squid/errors
 	ln -sf /usr/lib/squid/errors/English /etc/squid/errors
 
@@ -101,18 +104,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	touch /var/log/squid/access.log
 	chown -R squid:squid /var/log/squid /var/log/cache /var/log/updatexlrator
 
+	cp /usr/lib/squid/cachemgr.cgi /srv/web/ipfire/cgi-bin/cachemgr.cgi
+	chown nobody.nobody /srv/web/ipfire/cgi-bin/cachemgr.cgi
+
 	cp -f $(DIR_SRC)/config/updxlrator/updxlrator /usr/sbin/updxlrator
 	cp -f $(DIR_SRC)/config/updxlrator/checkup /var/ipfire/updatexlrator/bin/checkup
 	cp -f $(DIR_SRC)/config/updxlrator/download /var/ipfire/updatexlrator/bin/download
 	cp -f $(DIR_SRC)/config/updxlrator/convert /var/ipfire/updatexlrator/bin/convert
 	cp -f $(DIR_SRC)/config/updxlrator/lscache /var/ipfire/updatexlrator/bin/lscache
+	cp -f $(DIR_SRC)/config/updxlrator/checkdeaddl /var/ipfire/updatexlrator/bin/checkdeaddl
+
+	cp -f $(DIR_SRC)/config/updxlrator/updxlrator-lib.pl /var/ipfire/updatexlrator//updxlrator-lib.pl
 
 	-mkdir -p /usr/lib/squid/errors.ipfire
 	cp -fr $(DIR_SRC)/config/proxy/errors.ipfire/* /usr/lib/squid/errors.ipfire/
 	chmod 755 /usr/sbin/updxlrator /var/ipfire/updatexlrator/bin/checkup \
 		/var/ipfire/updatexlrator/bin/download \
 		/var/ipfire/updatexlrator/bin/convert \
-		/var/ipfire/updatexlrator/bin/lscache
+		/var/ipfire/updatexlrator/bin/lscache \
+		/var/ipfire/updatexlrator/bin/checkdeaddl
 
 	ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.daily
 	ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.monthly