summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-12-02 13:43:11 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-12-02 13:43:11 +0000
commit6554dce65a5d32c68a77484323c0450df8a613a0 (patch)
tree5eb0efd7a880301a3590ed257bfe871fc3f1f4a4
parent85eea12dace9542ffd62801c51b086cd7f34a088 (diff)
downloadaports-6554dce65a5d32c68a77484323c0450df8a613a0.tar.bz2
aports-6554dce65a5d32c68a77484323c0450df8a613a0.tar.xz
main/squid: update init.d script from gentoo
This should actually work and will enable support for multiple instances
-rw-r--r--main/squid/APKBUILD4
-rw-r--r--main/squid/squid.initd125
2 files changed, 72 insertions, 57 deletions
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 56d6a3378..cef3265b2 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=squid
pkgver=3.2.0.12
-pkgrel=3
+pkgrel=4
pkgdesc="A full-featured Web proxy cache server."
url="http://www.squid-cache.org"
install="squid.pre-install squid.pre-upgrade squid.post-install"
@@ -106,6 +106,6 @@ squid_kerb_auth() {
md5sums="f11b71b7c58a2a20e87707d4ba441743 squid-3.2.0.12.tar.bz2
084f7b1af1ac0cb8fea35c7a0905a80e squid-3.2.0.12-loggable-urlgroup.patch
c60237de253c02937f272d3b189d7679 cf_gen-pthread.patch
-db05ed77b174271f26c41e7493a0d104 squid.initd
+905e57c6d41414f54a75a5c0f9f7fac7 squid.initd
2897c725c201be53d3c9a7db0101bdf0 squid.confd
58823e0b86bc2dc71d270208b7b284b4 squid.logrotate"
diff --git a/main/squid/squid.initd b/main/squid/squid.initd
index e243ddd50..488a45b52 100644
--- a/main/squid/squid.initd
+++ b/main/squid/squid.initd
@@ -1,115 +1,130 @@
#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.10 2008/11/30 19:20:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.14 2011/10/23 18:45:39 polynomial-c Exp $
-opts="${opts} reload rotate"
-
-conf=/etc/squid/squid.conf
+extra_started_commands="reload rotate"
depend() {
+ use dns
need net
after firewall
}
+upprocval() {
+ [ -f $1 ] || return 0
+ if [ `cat $1` -lt $2 ]; then
+ echo $2 > $1
+ fi
+}
+
# Try to increase the # of filedescriptors we can open.
maxfds() {
[ -n "$SQUID_MAXFD" ] || return
- [ -f /proc/sys/fs/file-max ] || return 0
[ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192
- local global_file_max=`cat /proc/sys/fs/file-max`
local minimal_file_max=$(($SQUID_MAXFD + 4096))
- if [ "$global_file_max" -lt $minimal_file_max ]; then
- echo $minimal_file_max > /proc/sys/fs/file-max
+ upprocval /proc/sys/fs/file-max $minimal_file_max
+ if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then
+ upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max
fi
ulimit -n $SQUID_MAXFD
}
checkconfig() {
+ if [ ! -f /etc/squid/${SVCNAME}.conf ]; then
+ eerror "You need to create /etc/squid/${SVCNAME}.conf first."
+ eerror "An example can be found in /etc/squid/squid.conf.default"
+ return 1
+ fi
+
+ local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf)
+ [ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid
+ if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then
+ eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to"
+ eerror " /var/run/${SVCNAME}.pid"
+ eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
+ eerror " in any other instance of squid."
+ return 1
+ fi
+
maxfds
-
- local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < $conf)
+
+ local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf)
[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
local x
for x in $CACHE_SWAP ; do
if [ ! -e $x ] ; then
- ebegin "Initializing cache directories"
+ ebegin "Initializing cache directory ${x%/*}"
local ORIG_UMASK=$(umask)
umask 027
- local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N 2>&1)"
+
+ if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
+ eend 1
+ return 1
+ fi
+
+ local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)"
if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
umask $ORIG_UMASK
eend 1
echo "$INIT_CACHE_RESPONSE"
return 1
fi
+
umask $ORIG_UMASK
eend 0
break
fi
done
- squid -k parse
-}
-
-get_pidfile() {
- PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ {print $2}' $conf)
- [ -z "$PIDFILE" ] && PIDFILE=/var/run/squid/squid.pid
+ return 0
}
start() {
- get_pidfile
checkconfig || return 1
- ebegin "Starting squid"
- start-stop-daemon --start --pidfile "$PIDFILE" \
- --env KRB5_KTNAME="${SQUID_KEYTAB}" \
- --exec /usr/sbin/squid -- ${SQUID_OPTS}
+ ebegin "Starting ${SVCNAME}"
+ KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf
eend $? && sleep 1
}
stop() {
- local rc=0 pid
- ebegin "Stopping squid"
- get_pidfile
- /usr/sbin/squid -k shutdown
-
- # Now we have to wait until squid has _really_ stopped.
- if [ -f "$PIDFILE" ] ; then
- pid=$(cat "$PIDFILE")
- if [ -d /proc/$pid ]; then
+ ebegin "Stopping ${SVCNAME}"
+ if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
+ # Now we have to wait until squid has _really_ stopped.
+ sleep 1
+ if [ -f /var/run/${SVCNAME}.pid ] ; then
einfon "Waiting for squid to shutdown ."
- else
- rm -f "$PIDFILE"
+ cnt=0
+ while [ -f /var/run/${SVCNAME}.pid ] ; do
+ cnt=$(expr $cnt + 1)
+ if [ $cnt -gt 60 ] ; then
+ # Waited 120 seconds now. Fail.
+ echo
+ eend 1 "Failed."
+ break
+ fi
+ sleep 2
+ echo -n "."
+ done
+ echo
fi
- cnt=0
- while [ -f "$PIDFILE" ] ; do
- cnt=$(expr $cnt + 1)
- if [ $cnt -gt 60 ] ; then
- # Waited 120 seconds now. Fail.
- echo
- rc=1
- break
- fi
- sleep 2
- echo -n "."
- done
- echo
+ else
+ eerror "Squid shutdown failed, probably service is already down."
fi
- eend $rc
+ eend 0
}
reload() {
checkconfig || return 1
- ebegin "Reloading squid"
- /usr/sbin/squid -k reconfigure
+ ebegin "Reloading ${SVCNAME}"
+ /usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf
eend $?
}
rotate() {
- service_started squid || return 1
- ebegin "Rotating logs"
- /usr/sbin/squid -k rotate
+ service_started ${SVCNAME} || return 1
+ ebegin "Rotating ${SVCNAME} logs"
+ /usr/sbin/squid -k rotate -f /etc/squid/${SVCNAME}.conf
eend $?
}
-