Author: glen Date: Sun Feb 26 12:00:41 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- rename COUCHDB_RESPAWN to COUCHDB_RESPAWN_TIMEOUT; update descs; add
$COUCHDB_OPTIONS
---- Files affected:
packages/couchdb:
couchdb.init (1.6 -> 1.7)
---- Diffs:
================================================================
Index: packages/couchdb/couchdb.init
diff -u packages/couchdb/couchdb.init:1.6 packages/couchdb/couchdb.init:1.7
--- packages/couchdb/couchdb.init:1.6 Sun Feb 26 12:53:27 2012
+++ packages/couchdb/couchdb.init Sun Feb 26 13:00:36 2012
@@ -1,8 +1,8 @@
#!/bin/sh
#
-# couchdb Starts CouchDB
+# couchdb Apache CouchDB init script
# chkconfig: 2345 84 25
-# description: Apache CouchDB init script
+# description: Apache CouchDB init script for the database server.
# pidfile: /var/run/couchdb.pid
#
# $Id$
@@ -20,7 +20,7 @@
COUCHDB_USER='couchdb'
COUCHDB_STDOUT='/dev/null'
COUCHDB_STDERR='/dev/null'
-COUCHDB_RESPAWN='5'
+COUCHDB_RESPAWN_TIMEOUT='5'
# Get service config - may override defaults
[ -f /etc/sysconfig/couchdb ] && . /etc/sysconfig/couchdb
@@ -47,9 +47,10 @@
&& touch $COUCHDB_PID \
&& chown $COUCHDB_USER $COUCHDB_PID
daemon --user $COUCHDB_USER $COUCHDB \
- -b -c "$COUCHDB_INI" -p "$COUCHDB_PID" \
- -o "$COUCHDB_STDOUT" -e "$COUCHDB_STDERR" \
- -r "$COUCHDB_RESPAWN"
+ -b -c "$COUCHDB_INI" -p "$COUCHDB_PID" \
+ -o "$COUCHDB_STDOUT" -e "$COUCHDB_STDERR" \
+ -r "$COUCHDB_RESPAWN_TIMEOUT" \
+ $COUCHDB_OPTIONS
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/couchdb
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.init?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
