summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/couchdb/Makefile.am9
-rw-r--r--etc/couchdb/local_dev.ini18
2 files changed, 7 insertions, 20 deletions
diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am
index f66a1906..90925465 100644
--- a/etc/couchdb/Makefile.am
+++ b/etc/couchdb/Makefile.am
@@ -14,9 +14,9 @@ couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib
devcouchprivlibdir = $(abs_top_srcdir)/src/couchdb/.libs
localconf_DATA = default.ini
-noinst_DATA = default_dev.ini
+noinst_DATA = default_dev.ini local_dev.ini
-EXTRA_DIST = local.ini local_dev.ini
+EXTRA_DIST = local.ini
CLEANFILES = $(localconf_DATA) $(noinst_DATA)
@@ -44,6 +44,11 @@ default_dev.ini: default.ini.tpl
-e "s|%couchjs_command_name%|$(couchjs_dev_command_name)|g" \
< $< > $@
+local_dev.ini: local.ini
+ if test ! -f "$@"; then \
+ cp $< $@; \
+ fi
+
install-data-hook:
if test ! -f "$(DESTDIR)/$(localconfdir)/local.ini"; then \
cp $(srcdir)/local.ini "$(DESTDIR)/$(localconfdir)/local.ini"; \
diff --git a/etc/couchdb/local_dev.ini b/etc/couchdb/local_dev.ini
deleted file mode 100644
index 876295b1..00000000
--- a/etc/couchdb/local_dev.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-; CouchDB Configuration Settings
-
-; Custom settings should be made in this file. They will override settings
-; in default.ini, but unlike changes made to default.ini, this file won't be
-; overwritten on server upgrade.
-
-[couchdb]
-;max_document_size = 4294967296 ; bytes
-
-[httpd]
-; port = 5985
-;bind_address = 127.0.0.1
-
-[log]
-level = error
-
-[update_notification]
-;unique notifier name=/full/path/to/exe -with "cmd line arg"