summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Robbins <drobbins@gentoo.org>2000-12-22 01:07:26 +0000
committerDaniel Robbins <drobbins@gentoo.org>2000-12-22 01:07:26 +0000
commit3ea8cfbfd96f12402968e028d44162c538410809 (patch)
tree3ab67d14d82bfef2f9ba8f95fd3d1664fc9f43fe /net-www
parent*** empty log message *** (diff)
downloadhistorical-3ea8cfbfd96f12402968e028d44162c538410809.tar.gz
historical-3ea8cfbfd96f12402968e028d44162c538410809.tar.bz2
historical-3ea8cfbfd96f12402968e028d44162c538410809.zip
a few important squid tweaks
Diffstat (limited to 'net-www')
-rwxr-xr-xnet-www/squid/files/squid12
-rw-r--r--net-www/squid/squid-2.3.4s-r1.ebuild12
2 files changed, 14 insertions, 10 deletions
diff --git a/net-www/squid/files/squid b/net-www/squid/files/squid
index 50a1d440d407..c996447d24c3 100755
--- a/net-www/squid/files/squid
+++ b/net-www/squid/files/squid
@@ -10,17 +10,21 @@ PIDFILE=/var/run/squid.pid
EXE=/usr/bin/squid
start() {
- if [ ! -d /var/cache/squid/00 ]
+ local cachedir
+ cachedir=`cat /etc/squid/squid.conf | grep '^cache_dir' | awk '{ print $3 }'`
+ if [ ! -d ${cachedir}/00 ]
then
- $EXE -z
+ ebegin "Initializing squid cache"
+ $EXE -z
+ eend $? "Initialized cache." "Error initializing cache."
fi
- ebegin "Starting $SERVICE..."
+ ebegin "Starting $SERVICE"
start-stop-daemon --start --quiet --exec $EXE -- -sYD
eend $? "Started $SERVICE." "Error Starting $SERVICE."
}
stop() {
- ebegin "Stopping $SERVICE..."
+ ebegin "Stopping $SERVICE"
start-stop-daemon --stop --quiet --exec $EXE
eend $? "Stopped $SERVICE." "Error Stopping $SERVICE."
}
diff --git a/net-www/squid/squid-2.3.4s-r1.ebuild b/net-www/squid/squid-2.3.4s-r1.ebuild
index 346c90c55ae2..defe7a27064d 100644
--- a/net-www/squid/squid-2.3.4s-r1.ebuild
+++ b/net-www/squid/squid-2.3.4s-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2000 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.3.4s-r1.ebuild,v 1.4 2000/11/02 08:31:53 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.3.4s-r1.ebuild,v 1.5 2000/12/22 01:07:22 drobbins Exp $
P=squid-2.3.STABLE4
A=${P}-src.tar.gz
@@ -18,7 +18,7 @@ src_compile() {
cd ${S}
LDFLAGS="$LDFLAGS -lresolv" try ./configure --host=${CHOST} \
--prefix=/usr --sysconfdir=/etc/squid \
- --localstatedir=/var/squid \
+ --localstatedir=/var/state/squid \
--enable-ipf-transparent --enable-useragent-log \
--enable-async-io --enable-icmp
try make
@@ -43,7 +43,7 @@ src_install() {
dodir /var/squid
chown squid.daemon ${D}/var/squid
try make install prefix=${D}/usr sysconfdir=${D}/etc/squid \
- localstatedir=${D}/var/squid
+ localstatedir=${D}/var/state/squid
into /usr
cd auth_modules
dobin LDAP/squid_ldap_auth PAM/pam_auth SMB/smb_auth NCSA/ncsa_auth
@@ -56,13 +56,13 @@ src_install() {
cp ${O}/files/squid.conf ${D}/etc/squid
dodir /etc/rc.d/init.d
cp ${O}/files/squid ${D}/etc/rc.d/init.d
- rm -r ${D}/var/squid
+# rm -r ${D}/var/squid
dodir /var/log/squid
dodir /var/cache/squid
fowners squid.daemon /var/log/squid
fowners squid.daemon /var/cache/squid
- fperms 644 /var/log/squid
- fperms 644 /var/cache/squid
+ fperms 755 /var/log/squid
+ fperms 755 /var/cache/squid
}
pkg_config() {