Skip to content

Commit

Permalink
Separate static config data dir from bin dir.
Browse files Browse the repository at this point in the history
In at least the OS X install, the data and bin locations are
different.

Change-Id: I2f21248324eed6df7d037ec2b6842c9014bdc774
Reviewed-on: http://review.membase.org/6601
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
  • Loading branch information
dustin authored and alk committed May 27, 2011
1 parent 312e25c commit 54f8d92
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ do-install:
mkdir -p $(MOCHIWEB_LIBDIR)
cp -r deps/mochiweb/ebin $(MOCHIWEB_LIBDIR)/
mkdir -p $(DESTDIR)$(PREFIX)/etc/membase
sed -e 's|@PREFIX@|$(PREFIX_FOR_CONFIG)|g' <etc/static_config.in >$(DESTDIR)$(PREFIX)/etc/membase/static_config
sed -e 's|@DATA_PREFIX@|$(PREFIX_FOR_CONFIG)|g' -e 's|@BIN_PREFIX@|$(PREFIX_FOR_CONFIG)|g' \
<etc/static_config.in >$(DESTDIR)$(PREFIX)/etc/membase/static_config
touch $(DESTDIR)$(PREFIX)/etc/membase/config
mkdir -p $(DESTDIR)$(PREFIX)/bin/
sed -e 's|@PREFIX@|$(DESTDIR)$(PREFIX)|g' <membase-server.sh.in >$(DESTDIR)$(PREFIX)/bin/membase-server
Expand Down
12 changes: 6 additions & 6 deletions etc/static_config.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{error_logger_mf_dir, "@PREFIX@/var/lib/membase/logs"}.
{error_logger_mf_dir, "@DATA_PREFIX@/var/lib/membase/logs"}.
{error_logger_mf_maxbytes, 10485760}.
{error_logger_mf_maxfiles, 10}.
{path_config_bindir, "@PREFIX@/bin"}.
{path_config_etcdir, "@PREFIX@/etc/membase"}.
{path_config_libdir, "@PREFIX@/lib"}.
{path_config_datadir, "@PREFIX@/var/lib/membase"}.
{path_config_tmpdir, "@PREFIX@/var/lib/membase/tmp"}.
{path_config_bindir, "@BIN_PREFIX@/bin"}.
{path_config_etcdir, "@BIN_PREFIX@/etc/membase"}.
{path_config_libdir, "@BIN_PREFIX@/lib"}.
{path_config_datadir, "@DATA_PREFIX@/var/lib/membase"}.
{path_config_tmpdir, "@DATA_PREFIX@/var/lib/membase/tmp"}.

0 comments on commit 54f8d92

Please sign in to comment.