Skip to content

Commit 6033ae5

Browse files
author
Thomas Arts
committed
Re-implement 'riak chkconfig'
1 parent 86cd60e commit 6033ae5

File tree

3 files changed

+33
-7
lines changed

3 files changed

+33
-7
lines changed

rebar.config

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
{cluster_info, {git, "git://github.com/basho/cluster_info.git", {branch, "develop-3.0"}}},
1616
{riak_kv, {git, "git://github.com/basho/riak_kv.git", {branch, "develop-3.0"}}},
1717
{riak_auth_mods, {git, "git://github.com/basho/riak_auth_mods.git", {branch, "develop-3.0"}}},
18-
{riak_repl, {git, "git://github.com/basho/riak_repl.git", {branch, "develop-3.0"}}},
19-
{yokozuna, {git, "git://github.com/basho/yokozuna.git", {branch, "develop-3.0"}}}
18+
{riak_repl, {git, "git://github.com/basho/riak_repl.git", {branch, "develop-3.0"}}}
19+
%% {yokozuna, {git, "git://github.com/basho/yokozuna.git", {branch, "develop-3.0"}}}
2020
]}.
2121

2222
{project_plugins, [
@@ -66,7 +66,7 @@
6666
riak_api,
6767
riak_repl,
6868
cluster_info,
69-
yokozuna,
69+
%% yokozuna,
7070
riak_auth_mods]},
7171

7272
{dev_mode, false},
@@ -80,17 +80,20 @@
8080
{template, "rel/files/advanced.config", "etc/advanced.config"},
8181

8282
%% Copy additional bin scripts
83-
{template, "rel/files/riak-admin", "bin/riak-admin"},
84-
{template, "rel/files/riak-debug", "bin/riak-debug"},
85-
{template, "rel/files/riak-repl", "bin/riak-repl"}
83+
{template, "rel/files/riak-admin", "bin/riak-admin"},
84+
{template, "rel/files/riak-debug", "bin/riak-debug"},
85+
{template, "rel/files/riak-chkconfig", "bin/riak-chkconfig"},
86+
{template, "rel/files/riak-repl", "bin/riak-repl"},
87+
{template, "rel/files/check_riak_config", "bin/check_riak_config"}
8688
]},
8789

8890
{generate_start_script, true},
8991
{extended_start_script, true},
9092
{extended_start_script_extensions, [
9193
{admin, "riak-admin"},
9294
{debug, "riak-debug"},
93-
{repl, "riak-repl"}
95+
{repl, "riak-repl"},
96+
{chkconfig, "riak-chkconfig"}
9497
]},
9598

9699
{extended_start_script_hooks, [

rel/files/check_riak_config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/env escript
2+
%% -*- erlang -*-
3+
4+
main([ConfigPath]) ->
5+
try
6+
{ok, _} = file:consult(ConfigPath),
7+
io:format("config is OK\n")
8+
catch
9+
_:_ ->
10+
io:format("Error reading ~p\n", [ConfigPath])
11+
end.

rel/files/riak-chkconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/sh
2+
# -*- tab-width:4;indent-tabs-mode:nil -*-
3+
# ex: ts=4 sw=4 et
4+
5+
## cf_config defines the config arguments needed
6+
. bin/cf_config
7+
8+
## "vm.args = $VMARGS_PATH"
9+
## "app.config = $CONFIG_PATH"
10+
11+
$ERTS_DIR/bin/escript $RELEASE_ROOT_DIR/bin/check_riak_config $CONFIG_PATH
12+
echo $CUTTLE_CONF

0 commit comments

Comments
 (0)