couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r694432 - in /incubator/couchdb/trunk/etc: default/couchdb.tpl.in init/couchdb.tpl.in
Date Thu, 11 Sep 2008 19:29:38 GMT
Author: nslater
Date: Thu Sep 11 12:29:37 2008
New Revision: 694432

URL: http://svn.apache.org/viewvc?rev=694432&view=rev
Log:
remove PID and INI options from the etc/default file and added COUCHDB_OPTIONS variable

Modified:
    incubator/couchdb/trunk/etc/default/couchdb.tpl.in
    incubator/couchdb/trunk/etc/init/couchdb.tpl.in

Modified: incubator/couchdb/trunk/etc/default/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/etc/default/couchdb.tpl.in?rev=694432&r1=694431&r2=694432&view=diff
==============================================================================
--- incubator/couchdb/trunk/etc/default/couchdb.tpl.in (original)
+++ incubator/couchdb/trunk/etc/default/couchdb.tpl.in Thu Sep 11 12:29:37 2008
@@ -1,8 +1,7 @@
 # Sourced by init script for configuration.
 
 COUCHDB_USER=couchdb
-COUCHDB_INI_FILE=%localconfdir%/couch.ini
-COUCHDB_PID_FILE=%localstatedir%/run/couchdb.pid
 COUCHDB_STDOUT_FILE=/dev/null
 COUCHDB_STDERR_FILE=/dev/null
 COUCHDB_RESPAWN_TIMEOUT=5
+COUCHDB_OPTIONS=

Modified: incubator/couchdb/trunk/etc/init/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/etc/init/couchdb.tpl.in?rev=694432&r1=694431&r2=694432&view=diff
==============================================================================
--- incubator/couchdb/trunk/etc/init/couchdb.tpl.in (original)
+++ incubator/couchdb/trunk/etc/init/couchdb.tpl.in Thu Sep 11 12:29:37 2008
@@ -63,12 +63,6 @@
     # Start Apache CouchDB as a background process.
 
     command="$COUCHDB -b"
-    if test -n "$COUCHDB_INI_FILE"; then
-        command="$command -c $COUCHDB_INI_FILE"
-    fi
-    if test -n "$COUCHDB_PID_FILE"; then
-        command="$command -p $COUCHDB_PID_FILE"
-    fi
     if test -n "$COUCHDB_STDOUT_FILE"; then
         command="$command -o $COUCHDB_STDOUT_FILE"
     fi
@@ -78,11 +72,10 @@
     if test -n "$COUCHDB_RESPAWN_TIMEOUT"; then
         command="$command -r $COUCHDB_RESPAWN_TIMEOUT"
     fi
+    if test -n "$COUCHDB_OPTIONS"; then
+        command="$command $COUCHDB_OPTIONS"
+    fi
     if test -n "$COUCHDB_USER"; then
-        if test -n "$COUCHDB_PID_FILE"; then
-            touch $COUCHDB_PID_FILE
-            chown $COUCHDB_USER $COUCHDB_PID_FILE
-        fi
         if su $COUCHDB_USER -c "$command" > /dev/null; then
             return $SCRIPT_OK
         else
@@ -101,8 +94,8 @@
     # Stop the running Apache CouchDB process.
 
     command="$COUCHDB -d"
-    if test -n "$COUCHDB_PID_FILE"; then
-        command="$command -p $COUCHDB_PID_FILE"
+    if test -n "$COUCHDB_OPTIONS"; then
+        command="$command $COUCHDB_OPTIONS"
     fi
     if test -n "$COUCHDB_USER"; then
         if su $COUCHDB_USER -c "$command" > /dev/null; then



Mime
View raw message