You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2008/06/22 20:09:17 UTC
svn commit: r670388 - in /incubator/couchdb/branches/runtimeconfig:
bin/couchdb.tpl.in configure.ac etc/couchdb/ etc/couchdb/Makefile.am
etc/couchdb/couch.ini.tpl.in etc/couchdb/default.ini.tpl.in
src/couchdb/Makefile.am
Author: nslater
Date: Sun Jun 22 11:09:16 2008
New Revision: 670388
URL: http://svn.apache.org/viewvc?rev=670388&view=rev
Log:
couchdb now accepts multiple configuration files
Added:
incubator/couchdb/branches/runtimeconfig/etc/couchdb/default.ini.tpl.in
- copied, changed from r670369, incubator/couchdb/branches/runtimeconfig/etc/couchdb/couch.ini.tpl.in
Removed:
incubator/couchdb/branches/runtimeconfig/etc/couchdb/couch.ini.tpl.in
Modified:
incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in
incubator/couchdb/branches/runtimeconfig/configure.ac
incubator/couchdb/branches/runtimeconfig/etc/couchdb/ (props changed)
incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am
incubator/couchdb/branches/runtimeconfig/src/couchdb/Makefile.am
Modified: incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in?rev=670388&r1=670387&r2=670388&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in (original)
+++ incubator/couchdb/branches/runtimeconfig/bin/couchdb.tpl.in Sun Jun 22 11:09:16 2008
@@ -74,10 +74,10 @@
-h display a short help message and exit
-V display version information and exit
- -c FILE add a configuration FILE (defaults to $DEFAULT_INI_FILE and $LOCAL_INI_FILE)
+ -c FILE use configuration FILE (chainable, resets system default)
-i use the interactive Erlang shell
-b spawn as a background process
- -p FILE set the background PID FILE (defaults to $PID_FILE)
+ -p FILE set the background PID FILE (overrides system default)
-r SECONDS respawn background process after SECONDS (defaults to no respawn)
-o FILE redirect background stdout to FILE (defaults to $STDOUT_FILE)
-e FILE redirect background stderr to FILE (defaults to $STDERR_FILE)
@@ -181,9 +181,8 @@
if test -n "$start_arguments"; then
start_arguments="$start_arguments, ";
fi
- start_arguments="$start_arguments \"../$file\""
+ start_arguments="$start_arguments \\\"$file\\\""
done
- echo $start_arguments
command="`%ICU_CONFIG% --invoke` \
%ERL% $interactive_option -smp auto -sasl errlog_type error \
-pa %localerlanglibdir%/couch-%version%/ebin \
@@ -193,7 +192,7 @@
-eval \"application:load(couch)\" \
-eval \"crypto:start()\" \
-eval \"inets:start()\" \
- -eval \"couch_server:start([\\\"$start_arguments\\\"]), receive done -> done end.\" "
+ -eval \"couch_server:start([$start_arguments]), receive done -> done end.\" "
if test "$BACKGROUND_BOOLEAN" = "true" \
-a "$RECURSED_BOOLEAN" = "false"; then
$0 -c $INI_FILE -b -r $RESPAWN_TIMEOUT -p $PID_FILE \
Modified: incubator/couchdb/branches/runtimeconfig/configure.ac
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/configure.ac?rev=670388&r1=670387&r2=670388&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/configure.ac (original)
+++ incubator/couchdb/branches/runtimeconfig/configure.ac Sun Jun 22 11:09:16 2008
@@ -228,7 +228,7 @@
AC_CONFIG_FILES([bin/couchdb.tpl])
AC_CONFIG_FILES([bin/Makefile])
AC_CONFIG_FILES([etc/couchdb/Makefile])
-AC_CONFIG_FILES([etc/couchdb/couch.ini.tpl])
+AC_CONFIG_FILES([etc/couchdb/default.ini.tpl])
AC_CONFIG_FILES([etc/default/couchdb.tpl])
AC_CONFIG_FILES([etc/default/Makefile])
AC_CONFIG_FILES([etc/init/couchdb.tpl])
Propchange: incubator/couchdb/branches/runtimeconfig/etc/couchdb/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jun 22 11:09:16 2008
@@ -1,6 +1,4 @@
Makefile
Makefile.in
-couch_httpd.conf
-couch_httpd.conf.tpl
-couch.ini
-couch.ini.tpl
+default.ini
+default.ini.tpl
Modified: incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am?rev=670388&r1=670387&r2=670388&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am Sun Jun 22 11:09:16 2008
@@ -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 @@
-e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
-e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
< $< > $@
+
+install-data-hook:
+ if test ! -f "$(localconfdir)/local.ini"; then \
+ echo "; Use this file for your local configuration." > $(localconfdir)/local.ini; \
+ fi
+
+uninstall-local:
+ rm -f $(localconfdir)/local.ini
Copied: incubator/couchdb/branches/runtimeconfig/etc/couchdb/default.ini.tpl.in (from r670369, incubator/couchdb/branches/runtimeconfig/etc/couchdb/couch.ini.tpl.in)
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/etc/couchdb/default.ini.tpl.in?p2=incubator/couchdb/branches/runtimeconfig/etc/couchdb/default.ini.tpl.in&p1=incubator/couchdb/branches/runtimeconfig/etc/couchdb/couch.ini.tpl.in&r1=670369&r2=670388&rev=670388&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/couchdb/couch.ini.tpl.in (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/couchdb/default.ini.tpl.in Sun Jun 22 11:09:16 2008
@@ -1,5 +1,7 @@
; @configure_input@
+; Upgrading CouchDB will overwrite this file.
+
[CouchDB]
RootDirectory=%localstatelibdir%
UtilDriverDir=%couchprivlibdir%
Modified: incubator/couchdb/branches/runtimeconfig/src/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/src/couchdb/Makefile.am?rev=670388&r1=670387&r2=670388&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/src/couchdb/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/src/couchdb/Makefile.am Sun Jun 22 11:09:16 2008
@@ -140,4 +140,3 @@
if test -f "$(DESTDIR)/$(couchprivlibdir)/couch_erl_driver"; then \
rm -f "$(DESTDIR)/$(couchprivlibdir)/couch_erl_driver.so"; \
fi
-