Skip to content

Commit 6561418

Browse files
committed
Update riak control auth.mode setting
1 parent 9274129 commit 6561418

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

content/riak/kv/2.1.4/using/admin/riak-control.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ manipulating Riak clusters.
2424

2525
Though Riak Control [is maintained as a separate application](https://github.com/basho/riak_control), the necessary code for it ships with versions of Riak 1.1 and above and requires no additional installation steps.
2626

27-
Before getting started, you should know the address and port of the HTTP (or
28-
HTTPS) listeners for the cluster member(s) running Riak Control. You can obtain
27+
Before getting started, you should know the address and port of the HTTP (or
28+
HTTPS) listeners for the cluster member(s) running Riak Control. You can obtain
2929
this information from the configuration files as indicated here:
3030

3131
```riakconf
3232
listener.http.<name> = 127.0.0.1:8098
3333
34-
or
34+
or
3535
3636
listener.https.<name> = 127.0.0.1:8096
3737
38-
## *** The default listeners in the riak.conf file are
38+
## *** The default listeners in the riak.conf file are
3939
## named `internal`, so you would consult the value of
4040
## `listener.http.internal` in your configuration.
4141
@@ -52,8 +52,8 @@ listener.https.<name> = 127.0.0.1:8096
5252
%% Other configs
5353
]},
5454
55-
%% *** This is a truncated configuration to illustrate the
56-
%% pertinent items -- the `http` and `https` tuples within
55+
%% *** This is a truncated configuration to illustrate the
56+
%% pertinent items -- the `http` and `https` tuples within
5757
%% the `riak_api` tuple's value list.
5858
```
5959

@@ -98,13 +98,13 @@ riak_control = on
9898
Make sure to restart the node once you have enabled Riak Control for the
9999
change to take effect.
100100

101-
After restarting the node, you should be able to access it by going
101+
After restarting the node, you should be able to access it by going
102102
to `http://ip_address_of_listener:port/admin`. In the case of a development
103103
cluster using the default configuration, you would access Riak Control at
104104
<http://127.0.0.1:8098/admin></a>
105105

106-
If you enabled authentication for Riak Control while performing the above
107-
configuration, you will be unable to access Riak Control until you have enabled
106+
If you enabled authentication for Riak Control while performing the above
107+
configuration, you will be unable to access Riak Control until you have enabled
108108
and configured SSL and HTTPS.
109109

110110
## Enabling SSL and HTTPS
@@ -122,7 +122,7 @@ HTTP basic auth) for users of the web interface. It is disabled by
122122
default. To enable authentication:
123123

124124
```riakconf
125-
riak_control.auth.mode = on
125+
riak_control.auth.mode = userlist
126126
```
127127

128128
```appconfig

content/riak/kv/2.2.0/using/admin/riak-control.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ manipulating Riak clusters.
2424

2525
Though Riak Control [is maintained as a separate application](https://github.com/basho/riak_control), the necessary code for it ships with versions of Riak 1.1 and above and requires no additional installation steps.
2626

27-
Before getting started, you should know the address and port of the HTTP (or
28-
HTTPS) listeners for the cluster member(s) running Riak Control. You can obtain
27+
Before getting started, you should know the address and port of the HTTP (or
28+
HTTPS) listeners for the cluster member(s) running Riak Control. You can obtain
2929
this information from the configuration files as indicated here:
3030

3131
```riakconf
3232
listener.http.<name> = 127.0.0.1:8098
3333
34-
or
34+
or
3535
3636
listener.https.<name> = 127.0.0.1:8096
3737
38-
## *** The default listeners in the riak.conf file are
38+
## *** The default listeners in the riak.conf file are
3939
## named `internal`, so you would consult the value of
4040
## `listener.http.internal` in your configuration.
4141
@@ -52,8 +52,8 @@ listener.https.<name> = 127.0.0.1:8096
5252
%% Other configs
5353
]},
5454
55-
%% *** This is a truncated configuration to illustrate the
56-
%% pertinent items -- the `http` and `https` tuples within
55+
%% *** This is a truncated configuration to illustrate the
56+
%% pertinent items -- the `http` and `https` tuples within
5757
%% the `riak_api` tuple's value list.
5858
```
5959

@@ -98,13 +98,13 @@ riak_control = on
9898
Make sure to restart the node once you have enabled Riak Control for the
9999
change to take effect.
100100

101-
After restarting the node, you should be able to access it by going
101+
After restarting the node, you should be able to access it by going
102102
to `http://ip_address_of_listener:port/admin`. In the case of a development
103103
cluster using the default configuration, you would access Riak Control at
104104
<http://127.0.0.1:8098/admin></a>
105105

106-
If you enabled authentication for Riak Control while performing the above
107-
configuration, you will be unable to access Riak Control until you have enabled
106+
If you enabled authentication for Riak Control while performing the above
107+
configuration, you will be unable to access Riak Control until you have enabled
108108
and configured SSL and HTTPS.
109109

110110
## Enabling SSL and HTTPS
@@ -122,7 +122,7 @@ HTTP basic auth) for users of the web interface. It is disabled by
122122
default. To enable authentication:
123123

124124
```riakconf
125-
riak_control.auth.mode = on
125+
riak_control.auth.mode = userlist
126126
```
127127

128128
```appconfig

0 commit comments

Comments
 (0)