Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix minor annoyances and general cleanup prior to 1.1 release

  • Loading branch information...
commit 5351b37983130adca3e6b57609a915a4d8367085 1 parent d82a108
@jaredmorrow jaredmorrow authored
View
2  Makefile
@@ -81,7 +81,7 @@ orgs-README:
APPS = kernel stdlib sasl erts ssl tools os_mon runtime_tools crypto inets \
xmerl webtool snmp public_key mnesia eunit syntax_tools compiler
-COMBO_PLT = $(HOME)/.riak_combo_dialyzer_plt
+COMBO_PLT = $(HOME)/.$(REPO)_combo_dialyzer_plt
check_plt: compile
dialyzer --check_plt --plt $(COMBO_PLT) --apps $(APPS) \
View
23 client_lib/README
@@ -1,23 +1,6 @@
Riak client libraries are available for many languages. Rather than
bundle them with the Riak server source code, we have given them each
-their own source repository. Currently, official Riak client language
-libraries include:
+their own source repository.
- + Javascript
- https://github.com/basho/riak-javascript-client
-
- + Python
- https://github.com/basho/riak-python-client
-
- + Ruby
- http://github.com/seancribbs/ripple/
-
- + Java
- https://github.com/basho/riak-java-client
-
- + PHP
- https://github.com/basho/riak-php-client
-
- + Erlang
- https://github.com/basho/riak-erlang-client
- (using protocol buffers instead of distributed Erlang)
+The most up-to-date information on our client libraries can be found
+on our wiki clients page http://wiki.basho.com/Client-Libraries.html
View
13 package/deb/debian_riak_init
@@ -36,8 +36,6 @@ SCRIPTNAME=/etc/init.d/$NAME
# Load the VERBOSE setting and other rcS variables
. /lib/init/vars.sh
. /lib/lsb/init-functions
-# Setup command to control the node
-NODETOOL="$ERTS_PATH/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
#
# Function that starts the daemon/service
@@ -52,17 +50,6 @@ do_start()
RETVAL=`$DAEMON ping`
[ "$RETVAL" = "pong" ] && return 1
-#
-# --chuid just doesn't seem to work at all
-#
-# start-stop-daemon --start \
-# --name riak \
-# --chdir /var/lib/riak \
-# --chuid riak \
-# --user riak \
-# --exec $DAEMON -- $DAEMON_ARGS \
-# || return 2
-
su - riak -c "$DAEMON $DAEMON_ARGS" || return 2
}
View
1  package/rpm/Makefile
@@ -16,6 +16,7 @@ build: $(PKGERDIR)/SOURCES/$(APP)-$(PKG_VERSION).tar.gz rpmbuild
--define '_rpmdir $(CURDIR)/packages' \
--define '_srcrpmdir $(CURDIR)/packages' \
--define "_revision $(PKG_VERSION)" \
+ --define "_repo $(REPO)" \
--define "_version $(PKG_VERSION_NO_H)" \
--define "_release $(RELEASE)" \
--define "_versionstring $(VERSIONSTRING)" \
View
14 package/rpm/SPECS/riak.spec
@@ -9,7 +9,7 @@ Version: %{_version}
Release: %{_release}%{?dist}
License: Apache License
Group: Development/Libraries
-Source: http://bitbucket.org/basho/riak/get/%{name}-%{_revision}.tar.gz
+Source: %{name}-%{_revision}.tar.gz
Source1: riak_init
URL: http://basho.com
Vendor: Basho Technologies
@@ -53,14 +53,14 @@ cat > rel/vars.config <<EOF
{reduce_js_vms, 6}.
{hook_js_vms, 2}.
% Platform-specific installation paths
-{platform_bin_dir, "%{platform_bin_dir}"}.
+{platform_bin_dir, "%{platform_bin_dir}"}.
{platform_data_dir, "%{platform_data_dir}"}.
-{platform_etc_dir, "%{platform_etc_dir}"}.
-{platform_lib_dir, "%{platform_lib_dir}"}.
-{platform_log_dir, "%{platform_log_dir}"}.
+{platform_etc_dir, "%{platform_etc_dir}"}.
+{platform_lib_dir, "%{platform_lib_dir}"}.
+{platform_log_dir, "%{platform_log_dir}"}.
% vm.args
-{node, "riak@127.0.0.1"}.
-{crash_dump, "%{platform_log_dir}/erl_crash.dump"}.
+{node, "riak@127.0.0.1"}.
+{crash_dump, "%{platform_log_dir}/erl_crash.dump"}.
% bin/riak*
{runner_script_dir, "%{platform_bin_dir}"}.
{runner_base_dir, "%{platform_lib_dir}"}.
View
5 rel/files/app.config
@@ -20,7 +20,7 @@
% {certfile, "{{platform_etc_dir}}/cert.pem"},
% {keyfile, "{{platform_etc_dir}}/key.pem"}
% ]},
-
+
%% riak_handoff_port is the TCP port that Riak uses for
%% intra-cluster data handoff.
{handoff_port, {{handoff_port}} },
@@ -191,6 +191,7 @@
{data_root, "{{leveldb_data_root}}"}
]},
+ %% Lager Config
{lager, [
%% What handlers to install with what arguments
%% The defaults for the logfiles are to rotate the files when
@@ -271,7 +272,7 @@
%% admin panel.
{userlist, [{"user", "pass"}
]},
-
+
%% The admin panel is broken up into multiple
%% components, each of which is enabled or disabled
%% by one of these settings.
View
1  rel/reltool.config
@@ -75,4 +75,3 @@
{copy, "../ebin/etop_txt.beam", "lib/basho-patches"}
]}.
-
View
2  rel/vars.config
@@ -38,7 +38,7 @@
%% etc/vm.args
%%
{node, "riak@127.0.0.1"}.
-{crash_dump, "log/erl_crash.dump"}.
+{crash_dump, "{{platform_log_dir}}/erl_crash.dump"}.
%%
%% bin/riak
View
2  rel/vars/dev1_vars.config
@@ -34,7 +34,7 @@
%% etc/vm.args
%%
{node, "dev1@127.0.0.1"}.
-{crash_dump, "log/erl_crash.dump"}.
+{crash_dump, "{{platform_log_dir}}/erl_crash.dump"}.
%%
%% bin/riak
View
2  rel/vars/dev2_vars.config
@@ -34,7 +34,7 @@
%% etc/vm.args
%%
{node, "dev2@127.0.0.1"}.
-{crash_dump, "log/erl_crash.dump"}.
+{crash_dump, "{{platform_log_dir}}/erl_crash.dump"}.
%%
%% bin/riak
View
2  rel/vars/dev3_vars.config
@@ -34,7 +34,7 @@
%% etc/vm.args
%%
{node, "dev3@127.0.0.1"}.
-{crash_dump, "log/erl_crash.dump"}.
+{crash_dump, "{{platform_log_dir}}/erl_crash.dump"}.
%%
%% bin/riak
View
2  rel/vars/dev4_vars.config
@@ -34,7 +34,7 @@
%% etc/vm.args
%%
{node, "dev4@127.0.0.1"}.
-{crash_dump, "log/erl_crash.dump"}.
+{crash_dump, "{{platform_log_dir}}/erl_crash.dump"}.
%%
%% bin/riak
Please sign in to comment.
Something went wrong with that request. Please try again.