diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2009-06-21 15:39:34 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2009-06-21 15:39:34 +0000 |
| commit | a8688b6aa8ca6ba6b34a8588d7818d68c16dfa6d (patch) | |
| tree | dde5a0e07ada43d31671ee351d81eb6c17143780 /dev-db | |
| parent | Version bump (diff) | |
| download | gentoo-2-a8688b6aa8ca6ba6b34a8588d7818d68c16dfa6d.tar.gz gentoo-2-a8688b6aa8ca6ba6b34a8588d7818d68c16dfa6d.tar.bz2 gentoo-2-a8688b6aa8ca6ba6b34a8588d7818d68c16dfa6d.zip | |
Add steps to conf.d and init.d scripts to determine which beam script needs to be run (From #268222)
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/couchdb/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-db/couchdb/files/couchdb.conf-0.9 | 7 | ||||
| -rw-r--r-- | dev-db/couchdb/files/couchdb.init-0.9 | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog index 511b392bff4b..f6c28ee66629 100644 --- a/dev-db/couchdb/ChangeLog +++ b/dev-db/couchdb/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-db/couchdb # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.2 2009/04/01 11:08:07 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.3 2009/06/21 15:39:34 caleb Exp $ + + 21 Jun 2009; Caleb Tennis <caleb@gentoo.org> files/couchdb.conf-0.9, + files/couchdb.init-0.9: + Add steps to conf.d and init.d scripts to determine which beam.smp script + needs to be run *couchdb-0.9.0 (01 Apr 2009) diff --git a/dev-db/couchdb/files/couchdb.conf-0.9 b/dev-db/couchdb/files/couchdb.conf-0.9 index a2258d356c5e..5388e1a39c0f 100644 --- a/dev-db/couchdb/files/couchdb.conf-0.9 +++ b/dev-db/couchdb/files/couchdb.conf-0.9 @@ -7,3 +7,10 @@ COUCHDB_STDOUT_FILE="/dev/null" COUCHDB_STDERR_FILE="/dev/null" #COUCHDB_RESPAWN_TIMEOUT= #COUCHDB_OPTIONS= + +if [ -e /usr/lib*/erlang/erts-*/bin/beam.smp ]; then + COUCHDB_BEAM="beam.smp" +else + COUCHDB_BEAM="beam" +fi + diff --git a/dev-db/couchdb/files/couchdb.init-0.9 b/dev-db/couchdb/files/couchdb.init-0.9 index 42b92917143b..d0017d791359 100644 --- a/dev-db/couchdb/files/couchdb.init-0.9 +++ b/dev-db/couchdb/files/couchdb.init-0.9 @@ -33,7 +33,7 @@ start() { return -1 fi - start-stop-daemon --start --exec ${EXEC} --name beam \ + start-stop-daemon --start --exec ${EXEC} --name ${COUCHDB_BEAM} \ --user ${COUCHDB_USER} --chuid ${COUCHDB_USER} --pidfile ${COUCHDB_PID_FILE} -- $args eend $? "Failed to start ${SVCNAME}" @@ -41,7 +41,7 @@ start() { stop() { ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec ${EXEC} --name beam \ + start-stop-daemon --stop --exec ${EXEC} --name ${COUCHDB_BEAM} \ --pidfile ${COUCHDB_PID_FILE} eend $? "Failed to stop ${SVCNAME}" } |