diff options
Diffstat (limited to 'main/squid/squid.initd')
| -rw-r--r-- | main/squid/squid.initd | 125 |
1 files changed, 70 insertions, 55 deletions
diff --git a/main/squid/squid.initd b/main/squid/squid.initd index e243ddd50c..488a45b527 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 $? } - |