diff options
author | Jeremy Laine <jeremy.laine@m4x.org> | 2008-03-26 14:18:00 +0000 |
---|---|---|
committer | Jeremy Laine <jeremy.laine@m4x.org> | 2008-03-26 14:18:00 +0000 |
commit | 4c87a2194276a51024de7a1aa15bada9798687cf (patch) | |
tree | 5f745438b9efc548f4c3ef1717bba2cfae500026 /packages/squid/squid | |
parent | c86759af98a513b368c047195d2a923164f98c25 (diff) | |
download | openembedded-4c87a2194276a51024de7a1aa15bada9798687cf.tar.gz |
squid: improve configuration defaults and provide init script
* provide sane defaults for configuration file (based on Debian package)
* provide an init script for squid which creates log/cache directories
as needed
Diffstat (limited to 'packages/squid/squid')
-rw-r--r-- | packages/squid/squid/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/squid/squid/fix_epoll_check.patch | 11 | ||||
-rw-r--r-- | packages/squid/squid/squid.init | 70 |
3 files changed, 81 insertions, 0 deletions
diff --git a/packages/squid/squid/.mtn2git_empty b/packages/squid/squid/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/squid/squid/.mtn2git_empty diff --git a/packages/squid/squid/fix_epoll_check.patch b/packages/squid/squid/fix_epoll_check.patch new file mode 100644 index 0000000000..8f195277fd --- /dev/null +++ b/packages/squid/squid/fix_epoll_check.patch @@ -0,0 +1,11 @@ +--- squid-2.6.STABLE14.orig/configure.in 2007-07-15 16:21:59.000000000 +0200 ++++ squid-2.6.STABLE14/configure.in 2008-03-25 17:15:53.000000000 +0100 +@@ -2416,7 +2416,7 @@ + + if test -n "$SELECT_TYPE"; then + : # Nothing to do +-elif test "$ac_cv_epoll_works" = "yes" ; then ++elif test "$ac_cv_func_epoll_ctl" = "yes" && "$ac_cv_epoll_works" = "yes" ; then + SELECT_TYPE="epoll" + elif test "$ac_cv_func_kqueue" = "yes" ; then + SELECT_TYPE="kqueue" diff --git a/packages/squid/squid/squid.init b/packages/squid/squid/squid.init new file mode 100644 index 0000000000..80573bf6fa --- /dev/null +++ b/packages/squid/squid/squid.init @@ -0,0 +1,70 @@ +#!/bin/sh +DAEMON=/usr/sbin/squid +NAME=squid +DESC="Squid HTTP proxy" +PIDFILE=/var/run/squid.pid +SQUID_ARGS="-D -sYC" + +test -f $DAEMON || exit 0 + +grepconf() { + w=" " # space tab + sq=/etc/$NAME.conf + # sed is cool. + res=`sed -ne ' + s/^'$1'['"$w"']\+[^'"$w"']\+['"$w"']\+\([^'"$w"']\+\).*$/\1/p; + t end; + d; + :end q' < $sq` + [ -n "$res" ] || res=$2 + echo "$res" +} + +start() { + owner=nobody + + cdr=`grepconf cache_dir /var/spool/$NAME` + if [ ! -d "$cdr/00" ]; then + mkdir -p $cdr + chown $owner $cdr + $DAEMON -z + fi + + ldr="/var/log/$NAME" + if [ ! -d "$ldr" ]; then + mkdir -p $ldr + chown $owner $cdr + fi + + start-stop-daemon -S -p $PIDFILE -x $DAEMON +} + +stop() { + start-stop-daemon -K -p $PIDFILE -x $DAEMON +} + +case "$1" in + start) + echo -n "Starting $DESC: $NAME... " + start + echo "done." + ;; + stop) + echo -n "Stopping $DESC: $NAME... " + stop + echo "done." + ;; + restart) + echo "Restarting $DESC: $NAME... " + stop + sleep 1 + start + echo "done." + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac + +exit 0 |