Archives
Archives
| From: | "Caleb Tennis (caleb)" <caleb@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in dev-db/couchdb/files: couchdb.conf-0.9 couchdb.init-0.9 |
| Date: | Sun, 21 Jun 2009 15:39:36 |
| Message-Id: | E1MIP8n-0002Le-Rv@stork.gentoo.org |
| 1 | caleb 09/06/21 15:39:33 |
| 2 | |
| 3 | Modified: couchdb.conf-0.9 couchdb.init-0.9 |
| 4 | Log: |
| 5 | Add steps to conf.d and init.d scripts to determine which beam script needs to be run (From #268222) |
| 6 | (Portage version: 2.1.6.13/cvs/Linux i686) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.2 dev-db/couchdb/files/couchdb.conf-0.9 |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/couchdb/files/couchdb.conf-0.9?rev=1.2&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/couchdb/files/couchdb.conf-0.9?rev=1.2&content-type=text/plain |
| 13 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/couchdb/files/couchdb.conf-0.9?r1=1.1&r2=1.2 |
| 14 | |
| 15 | Index: couchdb.conf-0.9 |
| 16 | =================================================================== |
| 17 | RCS file: /var/cvsroot/gentoo-x86/dev-db/couchdb/files/couchdb.conf-0.9,v |
| 18 | retrieving revision 1.1 |
| 19 | retrieving revision 1.2 |
| 20 | diff -u -r1.1 -r1.2 |
| 21 | --- couchdb.conf-0.9 1 Apr 2009 11:08:05 -0000 1.1 |
| 22 | +++ couchdb.conf-0.9 21 Jun 2009 15:39:33 -0000 1.2 |
| 23 | @@ -7,3 +7,10 @@ |
| 24 | COUCHDB_STDERR_FILE="/dev/null" |
| 25 | #COUCHDB_RESPAWN_TIMEOUT= |
| 26 | #COUCHDB_OPTIONS= |
| 27 | + |
| 28 | +if [ -e /usr/lib*/erlang/erts-*/bin/beam.smp ]; then |
| 29 | + COUCHDB_BEAM="beam.smp" |
| 30 | +else |
| 31 | + COUCHDB_BEAM="beam" |
| 32 | +fi |
| 33 | + |
| 34 | |
| 35 | |
| 36 | |
| 37 | 1.2 dev-db/couchdb/files/couchdb.init-0.9 |
| 38 | |
| 39 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/couchdb/files/couchdb.init-0.9?rev=1.2&view=markup |
| 40 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/couchdb/files/couchdb.init-0.9?rev=1.2&content-type=text/plain |
| 41 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/couchdb/files/couchdb.init-0.9?r1=1.1&r2=1.2 |
| 42 | |
| 43 | Index: couchdb.init-0.9 |
| 44 | =================================================================== |
| 45 | RCS file: /var/cvsroot/gentoo-x86/dev-db/couchdb/files/couchdb.init-0.9,v |
| 46 | retrieving revision 1.1 |
| 47 | retrieving revision 1.2 |
| 48 | diff -u -r1.1 -r1.2 |
| 49 | --- couchdb.init-0.9 1 Apr 2009 11:08:05 -0000 1.1 |
| 50 | +++ couchdb.init-0.9 21 Jun 2009 15:39:33 -0000 1.2 |
| 51 | @@ -33,7 +33,7 @@ |
| 52 | return -1 |
| 53 | fi |
| 54 | |
| 55 | - start-stop-daemon --start --exec ${EXEC} --name beam \ |
| 56 | + start-stop-daemon --start --exec ${EXEC} --name ${COUCHDB_BEAM} \ |
| 57 | --user ${COUCHDB_USER} --chuid ${COUCHDB_USER} --pidfile ${COUCHDB_PID_FILE} -- $args |
| 58 | |
| 59 | eend $? "Failed to start ${SVCNAME}" |
| 60 | @@ -41,7 +41,7 @@ |
| 61 | |
| 62 | stop() { |
| 63 | ebegin "Stopping ${SVCNAME}" |
| 64 | - start-stop-daemon --stop --exec ${EXEC} --name beam \ |
| 65 | + start-stop-daemon --stop --exec ${EXEC} --name ${COUCHDB_BEAM} \ |
| 66 | --pidfile ${COUCHDB_PID_FILE} |
| 67 | eend $? "Failed to stop ${SVCNAME}" |
| 68 | } |