diff options
author | Alexander Shorin <kxepal@apache.org> | 2015-02-26 22:29:43 +0300 |
---|---|---|
committer | Alexander Shorin <kxepal@apache.org> | 2015-02-26 23:28:49 +0300 |
commit | deeb073ad16f54286e7fa7f6606b1d353171f6d8 (patch) | |
tree | db912392d04ded17858c915fe8a7154a460b4c62 | |
parent | cd7d0ecc05d4eb4d280c45e7f906e1b2d9d23acb (diff) | |
download | couchdb-deeb073ad16f54286e7fa7f6606b1d353171f6d8.tar.gz |
Rename cassim db to _metadata
This closes #1
COUCHDB-2619
COUCHDB-2620
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | src/setup.erl | 12 | ||||
-rwxr-xr-x | test/t.sh | 6 |
3 files changed, 10 insertions, 10 deletions
@@ -129,7 +129,7 @@ in Fauxton. b. Same as in a. - this manages the final setup bits, like creating the _users, - _replicator and _cassim/_metadata, _db_updates endpoints and + _replicator and _metadata, _db_updates endpoints and whatever else is needed. // TBD: collect what else is needed. diff --git a/src/setup.erl b/src/setup.erl index c48a616cb..b04b0bafb 100644 --- a/src/setup.erl +++ b/src/setup.erl @@ -46,12 +46,12 @@ is_cluster_enabled() -> has_cluster_system_dbs() -> - % GET /_users /_replicator /_cassim + % GET /_users /_replicator /_metadata case catch { fabric:get_db_info("_users"), fabric:get_db_info("_replicator"), - fabric:get_db_info("cassim")} of + fabric:get_db_info("_metadata")} of {{ok, _}, {ok, _}, {ok, _}} -> ok; _ -> no end. @@ -75,7 +75,7 @@ enable_cluster_int(Options, no) -> NewBindAddress = proplists:get_value(bind_address, Options), ok = require_admins(CurrentAdmins, NewCredentials), ok = require_bind_address(CurrentBindAddress, NewBindAddress), - + case NewCredentials of {undefined, undefined} -> ok; @@ -89,7 +89,7 @@ enable_cluster_int(Options, no) -> NewBindAddress -> config:set("httpd", "bind_address", binary_to_list(NewBindAddress)) end, - + Port = proplists:get_value(port, Options), case Port of undefined -> @@ -115,8 +115,8 @@ finish_cluster() -> finish_cluster_int(ok) -> {error, cluster_finished}; finish_cluster_int(no) -> - % create clustered databases (_users, _replicator, _cassim/_metadata - Databases = ["_users", "_replicator", "cassim"], + % create clustered databases (_users, _replicator, _metadata) + Databases = ["_users", "_replicator", "_metadata"], lists:foreach(fun fabric:create_db/1, Databases). @@ -48,11 +48,11 @@ curl a:b@127.0.0.1:15984/_cluster_setup -d '{"action":"finish_cluster"}' $HEADER # Show system dbs exist on node A curl a:b@127.0.0.1:15984/_users curl a:b@127.0.0.1:15984/_replicator -curl a:b@127.0.0.1:15984/cassim +curl a:b@127.0.0.1:15984/_metadata # Show system dbs exist on node B curl a:b@127.0.0.1:25984/_users curl a:b@127.0.0.1:25984/_replicator -curl a:b@127.0.0.1:25984/cassim +curl a:b@127.0.0.1:25984/_metadata -echo "YAY ALL GOOD"
\ No newline at end of file +echo "YAY ALL GOOD" |