diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2010-09-25 17:37:57 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2010-09-25 17:37:57 +0000 |
| commit | fe96a2fb6ee18501f319b667aa4c75fe09125964 (patch) | |
| tree | 649925f81209113fde2b6eaba8e4e6c984b32bab /etc | |
| parent | 0d173b449108658f9e6404a52303a985565b8315 (diff) | |
COUCHDB-393 related: moving couch.uri to a better place by default.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1001283 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/couchdb/Makefile.am | 3 | ||||
| -rw-r--r-- | etc/couchdb/default.ini.tpl.in | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am index ded52084..9367ceac 100644 --- a/etc/couchdb/Makefile.am +++ b/etc/couchdb/Makefile.am @@ -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" \ < $< > $@ diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in index 28817423..49a64058 100644 --- a/etc/couchdb/default.ini.tpl.in +++ b/etc/couchdb/default.ini.tpl.in @@ -11,7 +11,7 @@ max_attachment_chunk_size = 4294967296 ; 4GB 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 |