couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Filipe David Manana <fdman...@apache.org>
Subject Re: svn commit: r1001283 - in /couchdb/trunk/etc/couchdb: Makefile.am default.ini.tpl.in
Date Sat, 25 Sep 2010 18:00:45 GMT
On Sat, Sep 25, 2010 at 6:46 PM, Benoit Chesneau <bchesneau@gmail.com> wrote:
> data info shouldn't be in run . anyway too late now.  Could have been
> waiting a little more ...

We (me, Paul, Chris, Noah, Robert Newson) were all agreeing on
var/run/couchdb instead of var/lib/couchdb that I rushed into
committing it to trunk.
Sorry, should have waited for more opinions yes, I'll revert if needed.

>
> Sent from my nexus one.
>
> On Sep 25, 2010 7:38 PM, <fdmanana@apache.org> wrote:
> Author: fdmanana
> Date: Sat Sep 25 17:37:57 2010
> New Revision: 1001283
>
> URL: http://svn.apache.org/viewvc?rev=1001283&view=rev
> Log:
> COUCHDB-393 related: moving couch.uri to a better place by default.
>
> Modified:
>   couchdb/trunk/etc/couchdb/Makefile.am
>   couchdb/trunk/etc/couchdb/default.ini.tpl.in
>
> Modified: couchdb/trunk/etc/couchdb/Makefile.am
> URL:
> http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/Makefile.am?rev=1001283&r1=1001282&r2=1001283&view=diff
> ==============================================================================
> --- couchdb/trunk/etc/couchdb/Makefile.am (original)
> +++ couchdb/trunk/etc/couchdb/Makefile.am Sat Sep 25 17:37:57 2010
> @@ -32,6 +32,7 @@ default.ini: default.ini.tpl
>               -e "s|%localbuilddatadir%|../share/couchdb|g" \
>           -e "s|%localstatelibdir%|../var/lib/couchdb|g" \
>           -e "s|%localstatelogdir%|../var/log/couchdb|g" \
> +           -e "s|%localstaterundir%|../var/run/couchdb|g" \
>           -e "s|%couchprivlibdir%|../lib/couch-$(version)/priv/lib|g" \
>           -e "s|%couchjs_command_name%|couchjs.exe|g" \
>       < $< > $@
> @@ -43,6 +44,7 @@ default.ini: default.ini.tpl
>               -e "s|%localbuilddatadir%|$(localdatadir)|g" \
>           -e "s|%localstatelibdir%|$(localstatelibdir)|g" \
>           -e "s|%localstatelogdir%|$(localstatelogdir)|g" \
> +           -e "s|%localstaterundir%|$(localstaterundir)|g" \
>           -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
>           -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
>       < $< > $@
> @@ -55,6 +57,7 @@ default_dev.ini: default.ini.tpl
>               -e "s|%localbuilddatadir%|$(abs_top_builddir)/share|g" \
>           -e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \
>           -e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \
> +           -e "s|%localstaterundir%|$(abs_top_builddir)/tmp/run|g" \
>           -e "s|%couchprivlibdir%|$(devcouchprivlibdir)|g" \
>           -e "s|%couchjs_command_name%|$(couchjs_dev_command_name)|g" \
>       < $< > $@
>
> Modified: couchdb/trunk/etc/couchdb/default.ini.tpl.in
> URL:
> http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/default.ini.tpl.in?rev=1001283&r1=1001282&r2=1001283&view=diff
> ==============================================================================
> --- couchdb/trunk/etc/couchdb/default.ini.tpl.in (original)
> +++ couchdb/trunk/etc/couchdb/default.ini.tpl.in Sat Sep 25 17:37:57 2010
> @@ -11,7 +11,7 @@ max_attachment_chunk_size = 4294967296 ;
>  os_process_timeout = 5000 ; 5 seconds. for view and external servers.
>  max_dbs_open = 100
>  delayed_commits = true ; set this to false to ensure an fsync before 201
> Created is returned
> -uri_file = %localstatelibdir%/couch.uri
> +uri_file = %localstaterundir%/couch.uri
>
>  [httpd]
>  port = 5984
>



-- 
Filipe David Manana,
fdmanana@gmail.com, fdmanana@apache.org

"Reasonable men adapt themselves to the world.
 Unreasonable men adapt the world to themselves.
 That's why all progress depends on unreasonable men."

Mime
View raw message