couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r774385 - in /couchdb/branches/0.9.x: ./ README etc/Makefile.am etc/default/couchdb etc/init/couchdb.tpl.in var/Makefile.am
Date Wed, 13 May 2009 14:48:57 GMT
Author: jan
Date: Wed May 13 14:48:57 2009
New Revision: 774385

URL: http://svn.apache.org/viewvc?rev=774385&view=rev
Log:
merged r766338 from trunk

Modified:
    couchdb/branches/0.9.x/   (props changed)
    couchdb/branches/0.9.x/README
    couchdb/branches/0.9.x/etc/Makefile.am
    couchdb/branches/0.9.x/etc/default/couchdb   (props changed)
    couchdb/branches/0.9.x/etc/init/couchdb.tpl.in
    couchdb/branches/0.9.x/var/Makefile.am

Propchange: couchdb/branches/0.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 14:48:57 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181

Modified: couchdb/branches/0.9.x/README
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/README?rev=774385&r1=774384&r2=774385&view=diff
==============================================================================
--- couchdb/branches/0.9.x/README (original)
+++ couchdb/branches/0.9.x/README Wed May 13 14:48:57 2009
@@ -150,14 +150,12 @@
     chown -R couchdb:couchdb /usr/local/etc/couchdb
     chown -R couchdb:couchdb /usr/local/var/lib/couchdb
     chown -R couchdb:couchdb /usr/local/var/log/couchdb
-    chown -R couchdb:couchdb /usr/local/var/run/couchdb
 
 Change the permission of the Apache CouchDB directories by running:
 
     chmod -R 0770 /usr/local/etc/couchdb
     chmod -R 0770 /usr/local/var/lib/couchdb
     chmod -R 0770 /usr/local/var/log/couchdb
-    chmod -R 0770 /usr/local/var/run/couchdb
 
 Running Manually
 ^^^^^^^^^^^^^^^^

Modified: couchdb/branches/0.9.x/etc/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/etc/Makefile.am?rev=774385&r1=774384&r2=774385&view=diff
==============================================================================
--- couchdb/branches/0.9.x/etc/Makefile.am (original)
+++ couchdb/branches/0.9.x/etc/Makefile.am Wed May 13 14:48:57 2009
@@ -44,6 +44,7 @@
 	    -e "s|%bindir%|$(bindir)|" \
 	    -e "s|%sysconfdir%|$(sysconfdir)|" \
 	    -e "s|%localerlangbindir%|$(localerlangbindir)|" \
+	    -e "s|%localstaterundir%|$(localstaterundir)|" \
 	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
 	< $< > $@
 

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 14:48:57 2009
@@ -1,4 +1,4 @@
 /couchdb/branches/design_resources/etc/default/couchdb:751716-751803
 /couchdb/branches/form/etc/default/couchdb:729440-730015
-/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.9.x/etc/init/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/etc/init/couchdb.tpl.in?rev=774385&r1=774384&r2=774385&view=diff
==============================================================================
--- couchdb/branches/0.9.x/etc/init/couchdb.tpl.in (original)
+++ couchdb/branches/0.9.x/etc/init/couchdb.tpl.in Wed May 13 14:48:57 2009
@@ -30,6 +30,7 @@
 SCRIPT_NAME=`basename $0`
 COUCHDB=%bindir%/%couchdb_command_name%
 CONFIGURATION_FILE=%sysconfdir%/default/couchdb
+RUN_DIR=%localstaterundir%
 LSB_LIBRARY=/lib/lsb/init-functions
 
 if test ! -x $COUCHDB; then
@@ -75,7 +76,9 @@
     if test -n "$COUCHDB_OPTIONS"; then
         command="$command $COUCHDB_OPTIONS"
     fi
+    mkdir -p "$RUN_DIR"
     if test -n "$COUCHDB_USER"; then
+        chown $COUCHDB_USER "$RUN_DIR"
         if su $COUCHDB_USER -c "$command" > /dev/null; then
             return $SCRIPT_OK
         else

Modified: couchdb/branches/0.9.x/var/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/var/Makefile.am?rev=774385&r1=774384&r2=774385&view=diff
==============================================================================
--- couchdb/branches/0.9.x/var/Makefile.am (original)
+++ couchdb/branches/0.9.x/var/Makefile.am Wed May 13 14:48:57 2009
@@ -14,10 +14,8 @@
 	if test ! "$(mkdir_p)" = ""; then \
 	    $(mkdir_p) "$(DESTDIR)$(localstatelibdir)"; \
 	    $(mkdir_p) "$(DESTDIR)$(localstatelogdir)"; \
-	    $(mkdir_p) "$(DESTDIR)$(localstaterundir)"; \
 	else \
 	    echo "WARNING: You may have to create these directories by hand."; \
 	    mkdir -p "$(DESTDIR)$(localstatelibdir)"; \
 	    mkdir -p "$(DESTDIR)$(localstatelogdir)"; \
-	    mkdir -p "$(DESTDIR)$(localstaterundir)"; \
 	fi



Mime
View raw message