diff options
Diffstat (limited to 'community/couchdb/rc-script.patch')
| -rw-r--r-- | community/couchdb/rc-script.patch | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/community/couchdb/rc-script.patch b/community/couchdb/rc-script.patch index ef7be39df..1dd723ffc 100644 --- a/community/couchdb/rc-script.patch +++ b/community/couchdb/rc-script.patch @@ -1,40 +1,40 @@ ---- couchdb.orig 2011-11-15 19:06:16.000000000 +0400 -+++ couchdb 2011-11-15 19:08:24.000000000 +0400 -@@ -1,4 +1,6 @@ --#!/bin/sh -e -+#!/bin/bash -+. /etc/rc.conf -+. /etc/rc.d/functions +--- couchdb 2011-12-27 01:21:59.000000000 +0400 ++++ couchdb.my 2011-12-27 01:21:18.000000000 +0400 +@@ -1,6 +1,4 @@ +-#!/bin/bash +-. /etc/rc.conf +-. /etc/rc.d/functions ++#!/bin/sh -e # Licensed under the Apache License, Version 2.0 (the "License"); you may not # use this file except in compliance with the License. You may obtain a copy of -@@ -29,7 +31,7 @@ +@@ -31,7 +29,7 @@ NAME=couchdb SCRIPT_NAME=`basename $0` COUCHDB=/usr/bin/couchdb --CONFIGURATION_FILE=/etc/default/couchdb -+CONFIGURATION_FILE=/etc/conf.d/couchdb +-CONFIGURATION_FILE=/etc/conf.d/couchdb ++CONFIGURATION_FILE=/etc/default/couchdb RUN_DIR=/var/run/couchdb LSB_LIBRARY=/lib/lsb/init-functions -@@ -42,16 +44,14 @@ +@@ -44,14 +42,16 @@ fi log_daemon_msg () { -- # Dummy function to be replaced by LSB library. -- -- echo $@ -+ stat_busy $@ +- stat_busy $@ ++ # Dummy function to be replaced by LSB library. ++ ++ echo $@ } log_end_msg () { -- # Dummy function to be replaced by LSB library. -- ++ # Dummy function to be replaced by LSB library. ++ if test "$1" != "0"; then -- echo "Error with $DESCRIPTION: $NAME" -+ stat_fail -+ else -+ stat_done +- stat_fail +- else +- stat_done ++ echo "Error with $DESCRIPTION: $NAME" fi return $1 } @@ -42,8 +42,16 @@ command="$command $COUCHDB_OPTIONS" fi if test -n "$COUCHDB_USER"; then -- if su $COUCHDB_USER -c "$command"; then -+ if su $COUCHDB_USER -s /bin/bash -c "$command"; then +- if su $COUCHDB_USER -s /bin/bash -c "$command"; then ++ if su $COUCHDB_USER -c "$command"; then return $SCRIPT_OK else return $SCRIPT_ERROR +@@ -84,7 +84,6 @@ + # Start Apache CouchDB as a background process. + + mkdir -p "$RUN_DIR" +- chown -R $COUCHDB_USER "$RUN_DIR" + command="$COUCHDB -b" + if test -n "$COUCHDB_STDOUT_FILE"; then + command="$command -o $COUCHDB_STDOUT_FILE" |