diff options
| author | Christopher Lenz <cmlenz@apache.org> | 2008-04-15 12:21:00 +0000 |
|---|---|---|
| committer | Christopher Lenz <cmlenz@apache.org> | 2008-04-15 12:21:00 +0000 |
| commit | 39de3072bcf9fdeec6d3faeb125924c401242205 (patch) | |
| tree | da55307c8762f9ff16f7a7e478d971c0f352d281 /etc | |
| parent | 53968ddfd93bfe1aa403478de715ae0ac77db177 (diff) | |
Merged mochiweb branch back into trunk.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@648222 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/couchdb/Makefile.am | 13 | ||||
| -rw-r--r-- | etc/couchdb/couch.ini.tpl.in | 8 |
2 files changed, 8 insertions, 13 deletions
diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am index 981b1cc8..690bbb01 100644 --- a/etc/couchdb/Makefile.am +++ b/etc/couchdb/Makefile.am @@ -12,11 +12,9 @@ datarootdir = @prefix@/share -pkgconf_DATA = couch.ini couch_httpd.conf +pkgconf_DATA = couch.ini -nobase_dist_pkgconf_DATA = conf/mime.types - -CLEANFILES = $(pkgconf_DATA) $(dist_pkgconf_DATA) +CLEANFILES = $(pkgconf_DATA) transform = @program_transform_name@ couchjs_command_name = `echo couchjs | sed '$(transform)'` @@ -32,10 +30,3 @@ couch.ini: couch.ini.tpl -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \ -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \ < $< > $@ - -couch_httpd.conf: couch_httpd.conf.tpl - sed -e "s|%pkgconfdir%|@pkgconfdir@|g" \ - -e "s|%pkgdatadir%|@pkgdatadir@|g" \ - -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \ - < $< > $@ - diff --git a/etc/couchdb/couch.ini.tpl.in b/etc/couchdb/couch.ini.tpl.in index 81b47f7f..8b3b6ec9 100644 --- a/etc/couchdb/couch.ini.tpl.in +++ b/etc/couchdb/couch.ini.tpl.in @@ -6,9 +6,13 @@ ConsoleStartupMsg=Apache CouchDB is starting. DbRootDir=%pkgstatelibdir% -LogFile=%pkgstatelogdir%/couch.log +Port=5984 + +BindAddress=127.0.0.1 -HttpConfigFile=%pkgconfdir%/couch_httpd.conf +DocumentRoot=%pkgdatadir%/www + +LogFile=%pkgstatelogdir%/couch.log UtilDriverDir=%couchprivlibdir% |