summaryrefslogtreecommitdiff
path: root/etc/couchdb
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2008-08-20 13:55:41 +0000
committerJan Lehnardt <jan@apache.org>2008-08-20 13:55:41 +0000
commit2bc4be3dbf9e8ea3b67c62f2d99087ff4b43c17b (patch)
tree9a961f6f3fb0acbd9d34abef40492bbe95cc3d94 /etc/couchdb
parentad6fd47a1f13e8d09eb5864c50e102825e28b75c (diff)
Merge runtimeconfig branch back into trunk
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@687336 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'etc/couchdb')
-rw-r--r--etc/couchdb/Makefile.am16
-rw-r--r--etc/couchdb/couch.ini.tpl.in21
2 files changed, 12 insertions, 25 deletions
diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am
index 9f686780..c253048d 100644
--- a/etc/couchdb/Makefile.am
+++ b/etc/couchdb/Makefile.am
@@ -10,16 +10,16 @@
## License for the specific language governing permissions and limitations
## under the License.
-localconf_DATA = couch.ini
+couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib
+
+localconf_DATA = default.ini
CLEANFILES = $(localconf_DATA)
transform = @program_transform_name@
couchjs_command_name = `echo couchjs | sed '$(transform)'`
-couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib
-
-couch.ini: couch.ini.tpl
+default.ini: default.ini.tpl
sed -e "s|%bindir%|$(bindir)|g" \
-e "s|%localconfdir%|$(localconfdir)|g" \
-e "s|%localdatadir%|$(localdatadir)|g" \
@@ -28,3 +28,11 @@ couch.ini: couch.ini.tpl
-e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
-e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
< $< > $@
+
+install-data-hook:
+ if test ! -f "$(localconfdir)/local.ini"; then \
+ cp local.ini $(localconfdir)/local.ini; \
+ fi
+
+uninstall-local:
+ rm -f $(localconfdir)/local.ini
diff --git a/etc/couchdb/couch.ini.tpl.in b/etc/couchdb/couch.ini.tpl.in
index af7d32b7..e69de29b 100644
--- a/etc/couchdb/couch.ini.tpl.in
+++ b/etc/couchdb/couch.ini.tpl.in
@@ -1,21 +0,0 @@
-[Couch]
-
-ConsoleStartupMsg=Apache CouchDB is starting.
-
-DbRootDir=%localstatelibdir%
-
-Port=5984
-
-BindAddress=127.0.0.1
-
-DocumentRoot=%localdatadir%/www
-
-LogFile=%localstatelogdir%/couch.log
-
-UtilDriverDir=%couchprivlibdir%
-
-LogLevel=info
-
-[Couch Query Servers]
-
-javascript=%bindir%/%couchjs_command_name% %localdatadir%/server/main.js