- updated for 0.9.4

Changed files:
    cherokee-php-path.patch -> 1.3
    cherokee.init -> 1.10

diff --git a/cherokee-php-path.patch b/cherokee-php-path.patch
index 0dc6ee4740c619d1b70d5dd2b58301142c8363f0..81acdeb4643fe3d107b4f6b951d74ef6a8e48d88 100644 (file)
--- a/cherokee-php-path.patch
+++ b/cherokee-php-path.patch
@@ -5,7 +5,24 @@
        "php5", 
        "php4", 
 -      "php-cgi",
-+      "php.cgi",
++      "php.fcgi",
  #else
        "PHP.EXE",
  #endif
+--- cherokee-0.9.4/configure.in.orig   2008-10-09 13:41:48.000000000 +0200
++++ cherokee-0.9.4/configure.in        2008-10-21 01:20:27.000000000 +0200
+@@ -1145,13 +1145,7 @@
+ if test "x$PHPCGI" = "x"; then
+    AC_MSG_RESULT([no])
+ else
+-   $PHPCGI -v | grep 'cgi-fcgi' >/dev/null 2>/dev/null
+-   if test $? != 0; then
+-      PHPCGI=""
+-      AC_MSG_RESULT([no])
+-   else
+-      AC_MSG_RESULT([yes])
+-   fi
++   AC_MSG_RESULT([yes])
+ fi
+ 
+ if test "x$PHPCGI" = "x"; then

diff --git a/cherokee.init b/cherokee.init
index 482a398cf9b5bf54cb04fd6356ea27ef46dab779..3343fd16602c86d989108489d8b37f8a2d17e92c 100644 (file)
--- a/cherokee.init
+++ b/cherokee.init
@@ -37,7 +37,7 @@ case "$1" in
                # it offers no stdout/stderr logging. workaround
                exec 2>>/var/log/cherokee/cherokee.log
                exec 1>&2
-               start-stop-daemon --start --exec /usr/sbin/cherokee-guardian -- -b
+               start-stop-daemon --start --pidfile /var/run/cherokee.pid --oknodo -b --exec /usr/sbin/cherokee
                )
                RETVAL=$?
                if [ $RETVAL -eq 0 ]; then
@@ -54,7 +54,7 @@ case "$1" in
        if [ -f /var/lock/subsys/cherokee ]; then
                # Stop daemons.
                msg_stopping "Cherokee Web Server"
-               start-stop-daemon --stop --pidfile /var/run/cherokee-guardian.pid --oknodo --exec /usr/sbin/cherokee-guardian
+               start-stop-daemon --stop --pidfile /var/run/cherokee.pid --oknodo --exec /usr/sbin/cherokee
                RETVAL=$?
                if [ $RETVAL -eq 0 ]; then
                        rm -f /var/lock/subsys/cherokee >/dev/null 2>&1