You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2015/09/14 13:45:54 UTC
[1/3] couchdb-setup git commit: configure the right http interface
Repository: couchdb-setup
Updated Branches:
refs/heads/wizard-admin.party 20ac682c0 -> f60e1d400 (forced update)
configure the right http interface
Project: http://git-wip-us.apache.org/repos/asf/couchdb-setup/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-setup/commit/bdb8a0c1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-setup/tree/bdb8a0c1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-setup/diff/bdb8a0c1
Branch: refs/heads/wizard-admin.party
Commit: bdb8a0c19e95316912488b986de8d113690b0cd6
Parents: ff19be1
Author: Robert Newson <rn...@apache.org>
Authored: Mon Sep 14 12:39:49 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Mon Sep 14 12:39:49 2015 +0100
----------------------------------------------------------------------
src/setup.erl | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-setup/blob/bdb8a0c1/src/setup.erl
----------------------------------------------------------------------
diff --git a/src/setup.erl b/src/setup.erl
index 2118349..4067956 100644
--- a/src/setup.erl
+++ b/src/setup.erl
@@ -36,7 +36,7 @@ require_bind_address(_, _) ->
is_cluster_enabled() ->
% bind_address != 127.0.0.1 AND admins != empty
- BindAddress = config:get("httpd", "bind_address"),
+ BindAddress = config:get("chttpd", "bind_address"),
Admins = config:get("admins"),
case {BindAddress, Admins} of
{"127.0.0.1", _} -> no;
@@ -115,7 +115,7 @@ enable_cluster_int(Options, no) ->
},
% if bind_address == 127.0.0.1 and no bind_address in req -> error
- CurrentBindAddress = config:get("httpd","bind_address"),
+ CurrentBindAddress = config:get("chttpd","bind_address"),
NewBindAddress = proplists:get_value(bind_address, Options),
ok = require_admins(CurrentAdmins, NewCredentials),
ok = require_bind_address(CurrentBindAddress, NewBindAddress),
@@ -129,9 +129,9 @@ enable_cluster_int(Options, no) ->
case NewBindAddress of
undefined ->
- config:set("httpd", "bind_address", "0.0.0.0");
+ config:set("chttpd", "bind_address", "0.0.0.0");
NewBindAddress ->
- config:set("httpd", "bind_address", binary_to_list(NewBindAddress))
+ config:set("chttpd", "bind_address", binary_to_list(NewBindAddress))
end,
Port = proplists:get_value(port, Options),
@@ -139,7 +139,7 @@ enable_cluster_int(Options, no) ->
undefined ->
ok;
Port ->
- config:set("httpd", "port", integer_to_list(Port))
+ config:set("chttpd", "port", integer_to_list(Port))
end,
couch_log:notice("Enable Cluster: ~p~n", [Options]).
%cluster_state:set(enabled).
[2/3] couchdb-setup git commit: fix enable_cluster_http for
admin-party clusters
Posted by rn...@apache.org.
fix enable_cluster_http for admin-party clusters
Project: http://git-wip-us.apache.org/repos/asf/couchdb-setup/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-setup/commit/5fb322ce
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-setup/tree/5fb322ce
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-setup/diff/5fb322ce
Branch: refs/heads/wizard-admin.party
Commit: 5fb322ce43329e991afb5c0180054bddb6c87159
Parents: bdb8a0c
Author: Robert Kowalski <ro...@apache.org>
Authored: Fri Jul 31 17:04:23 2015 +0200
Committer: Robert Newson <rn...@apache.org>
Committed: Mon Sep 14 12:40:20 2015 +0100
----------------------------------------------------------------------
src/setup.erl | 21 +++++++++++-----
test/t-admin-party.sh | 60 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 75 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-setup/blob/5fb322ce/src/setup.erl
----------------------------------------------------------------------
diff --git a/src/setup.erl b/src/setup.erl
index 4067956..2bc55dd 100644
--- a/src/setup.erl
+++ b/src/setup.erl
@@ -69,14 +69,23 @@ enable_cluster(Options) ->
enable_cluster_http(Options)
end.
+get_remote_request_options(Options) ->
+ case couch_util:get_value(remote_current_user, Options, undefined) of
+ undefined ->
+ [];
+ _ ->
+ [
+ {basic_auth, {
+ binary_to_list(couch_util:get_value(remote_current_user, Options)),
+ binary_to_list(couch_util:get_value(remote_current_password, Options))
+ }}
+ ]
+ end.
+
enable_cluster_http(Options) ->
% POST to nodeB/_setup
- RequestOptions = [
- {basic_auth, {
- binary_to_list(couch_util:get_value(remote_current_user, Options)),
- binary_to_list(couch_util:get_value(remote_current_password, Options))
- }}
- ],
+
+ RequestOptions = get_remote_request_options(Options),
Body = ?JSON_ENCODE({[
{<<"action">>, <<"enable_cluster">>},
http://git-wip-us.apache.org/repos/asf/couchdb-setup/blob/5fb322ce/test/t-admin-party.sh
----------------------------------------------------------------------
diff --git a/test/t-admin-party.sh b/test/t-admin-party.sh
new file mode 100755
index 0000000..3c94917
--- /dev/null
+++ b/test/t-admin-party.sh
@@ -0,0 +1,60 @@
+#!/bin/sh -ex
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+HEADERS="-HContent-Type:application/json"
+# show cluster state:
+curl 127.0.0.1:15986/_nodes/_all_docs
+
+# Enable Cluster on node A
+curl 127.0.0.1:15984/_cluster_setup -d '{"action":"enable_cluster","username":"a","password":"b","bind_address":"0.0.0.0"}' $HEADERS
+
+# Add node B on node A
+curl a:b@127.0.0.1:15984/_cluster_setup -d '{"action":"add_node","username":"a","password":"b","host":"127.0.0.1","port":25984}' $HEADERS
+
+# Enable Cluster on node B
+curl a:b@127.0.0.1:15984/_cluster_setup -d '{"action":"enable_cluster","remote_node":"127.0.0.1","port":"25984","username":"a","password":"b","bind_address":"0.0.0.0"}' $HEADERS
+
+# Show cluster state:
+curl a:b@127.0.0.1:15986/_nodes/_all_docs
+
+# Show db doesn’t exist on node A
+curl a:b@127.0.0.1:15984/foo
+
+# Show db doesn’t exist on node B
+curl a:b@127.0.0.1:25984/foo
+
+# Create database (on node A)
+curl -X PUT a:b@127.0.0.1:15984/foo
+
+# Show db does exist on node A
+curl a:b@127.0.0.1:15984/foo
+
+# Show db does exist on node B
+curl a:b@127.0.0.1:25984/foo
+
+# Finish cluster
+curl a:b@127.0.0.1:15984/_cluster_setup -d '{"action":"finish_cluster"}' $HEADERS
+
+# 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/_metadata
+curl a:b@127.0.0.1:15984/_global_changes
+
+# 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/_metadata
+curl a:b@127.0.0.1:25984/_global_changes
+
+echo "YAY ALL GOOD"
[3/3] couchdb-setup git commit: fix badarg error
Posted by rn...@apache.org.
fix badarg error
Project: http://git-wip-us.apache.org/repos/asf/couchdb-setup/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-setup/commit/f60e1d40
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-setup/tree/f60e1d40
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-setup/diff/f60e1d40
Branch: refs/heads/wizard-admin.party
Commit: f60e1d400261b698bbf977ff9aa470ea05132c05
Parents: 5fb322c
Author: Robert Kowalski <ro...@apache.org>
Authored: Thu Sep 10 21:08:39 2015 +0200
Committer: Robert Newson <rn...@apache.org>
Committed: Mon Sep 14 12:40:54 2015 +0100
----------------------------------------------------------------------
src/setup.erl | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-setup/blob/f60e1d40/src/setup.erl
----------------------------------------------------------------------
diff --git a/src/setup.erl b/src/setup.erl
index 2bc55dd..cf7570a 100644
--- a/src/setup.erl
+++ b/src/setup.erl
@@ -147,8 +147,10 @@ enable_cluster_int(Options, no) ->
case Port of
undefined ->
ok;
- Port ->
- config:set("chttpd", "port", integer_to_list(Port))
+ Port when is_binary(Port) ->
+ config:set("chttpd", "port", binary_to_list(Port));
+ Port when is_integer(Port) ->
+ config:set_integer("chttpd", "port", Port)
end,
couch_log:notice("Enable Cluster: ~p~n", [Options]).
%cluster_state:set(enabled).