SOURCES: cherokee-config.patch, cherokee-php-path.patch, cherokee....

[patrys]

Author: patrys                       Date: Thu Apr 17 15:57:31 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 0.6.1
- use guardian as default daemon
- works
- TODO: package %{_libdir}/libcherokee*

---- Files affected:
SOURCES:
   cherokee-config.patch (1.1 -> 1.2) , cherokee-php-path.patch (1.1 -> 1.2) , cherokee.init (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/cherokee-config.patch
diff -u SOURCES/cherokee-config.patch:1.1 SOURCES/cherokee-config.patch:1.2
--- SOURCES/cherokee-config.patch:1.1	Sat Dec 31 16:35:14 2005
+++ SOURCES/cherokee-config.patch	Thu Apr 17 17:57:25 2008
@@ -1,13 +1,11 @@
---- cherokee-0.4.29/cherokee.conf.sample.pre.old	2005-10-20 00:27:03.000000000 +0300
-+++ cherokee-0.4.29/cherokee.conf.sample.pre	2005-12-31 16:32:18.000000000 +0200
-@@ -35,8 +35,8 @@
- ## Eg: User 65534
- ##     Group 65534
- ##
--#User nobody
--#Group nogroup
-+User cherokee
-+Group cherokee
+--- cherokee-0.6.1/cherokee.conf.sample.pre~	2008-03-18 22:09:32.000000000 +0100
++++ cherokee-0.6.1/cherokee.conf.sample.pre	2008-04-17 17:30:36.373880993 +0200
+@@ -8,6 +8,8 @@
  
- ##
- ## Chroot:
+ # Server
+ #
++server!user = cherokee
++server!group = cherokee
+ server!port = 80
+ server!port_tls = 443
+ server!timeout = 60

================================================================
Index: SOURCES/cherokee-php-path.patch
diff -u SOURCES/cherokee-php-path.patch:1.1 SOURCES/cherokee-php-path.patch:1.2
--- SOURCES/cherokee-php-path.patch:1.1	Sat Dec 31 16:35:40 2005
+++ SOURCES/cherokee-php-path.patch	Thu Apr 17 17:57:26 2008
@@ -1,21 +1,11 @@
---- cherokee-0.4.29/cherokee/handler_phpcgi.c~	2005-11-05 12:18:17.000000000 +0200
-+++ cherokee-0.4.29/cherokee/handler_phpcgi.c	2005-12-31 16:40:31.000000000 +0200
-@@ -55,16 +55,12 @@
- 
- 
- static char *php_paths[] = {
--	"/usr/lib/cgi-bin/",
--	"/usr/local/bin/",
-+	"/usr/bin/",
- 	NULL
- };
- 
- static char *php_names[] = {
--	"php", 
--	"php5", 
--	"php4", 
--	"php3",
-+	"php.cgi", 
- 	NULL
- };
- 
+--- cherokee-0.6.1/cherokee/handler_phpcgi.c~	2008-04-17 16:41:42.000000000 +0200
++++ cherokee-0.6.1/cherokee/handler_phpcgi.c	2008-04-17 16:45:23.471106094 +0200
+@@ -71,7 +71,7 @@
+ 	"php", 
+ 	"php5", 
+ 	"php4", 
+-	"php-cgi",
++	"php.cgi",
+ #else
+ 	"PHP.EXE",
+ #endif

================================================================
Index: SOURCES/cherokee.init
diff -u SOURCES/cherokee.init:1.8 SOURCES/cherokee.init:1.9
--- SOURCES/cherokee.init:1.8	Thu Jan  5 14:11:16 2006
+++ SOURCES/cherokee.init	Thu Apr 17 17:57:26 2008
@@ -37,13 +37,10 @@
 		# 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 --pidfile /var/run/cherokee.pid -- -b
+		start-stop-daemon --start --exec /usr/sbin/cherokee-guardian -- -b
 		)
 		RETVAL=$?
 		if [ $RETVAL -eq 0 ]; then
-			# the pidfile written is wrong when cherokee -b is used. damn
-			pid=$(/sbin/pidof cherokee)
-			echo $pid > /var/run/cherokee.pid
 			touch /var/lock/subsys/cherokee
 			ok
 		else
@@ -57,10 +54,10 @@
 	if [ -f /var/lock/subsys/cherokee ]; then
 		# Stop daemons.
 		msg_stopping "Cherokee Web Server"
-		start-stop-daemon --stop --pidfile /var/run/cherokee.pid --oknodo --exec /usr/sbin/cherokee
+		start-stop-daemon --stop --pidfile /var/run/cherokee-guardian.pid --oknodo --exec /usr/sbin/cherokee-guardian
 		RETVAL=$?
 		if [ $RETVAL -eq 0 ]; then
-			rm -f /var/run/cherokee.pid /var/lock/subsys/cherokee >/dev/null 2>&1
+			rm -f /var/lock/subsys/cherokee >/dev/null 2>&1
 			ok
 		else
 			fail
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cherokee-config.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cherokee-php-path.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cherokee.init?r1=1.8&r2=1.9&f=u