Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

preparing cookbook for 1.1 release.

  • Loading branch information...
commit b31c74e61d91bed5a789f4f01d1c3ae3dfaec1f9 1 parent b0766d3
@densone authored
View
23 attributes/control.rb
@@ -0,0 +1,23 @@
+#
+# Author:: Sean Carey (<densone@basho.com>)
+# Cookbook Name:: riak
+#
+# Copyright (c) 2011 Basho Technologies, Inc.
+#
+# 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.
+#
+
+default.riak.control.enabled = :false
+default.riak.control.auth = :userlist
+default.riak.control.userlist = ["user","pass"]
+default.riak.control.admin = :true
View
1  attributes/default.rb
@@ -28,3 +28,4 @@
include_attribute "riak::lager"
include_attribute "riak::sysmon"
include_attribute "riak::merge"
+include_attribute "riak::control"
View
4 attributes/package.rb
@@ -19,8 +19,8 @@
default.riak.package.type = "binary"
default.riak.package.version.major = "1"
-default.riak.package.version.minor = "0"
-default.riak.package.version.incremental = "3"
+default.riak.package.version.minor = "1"
+default.riak.package.version.incremental = "0"
default.riak.package.version.build = "1"
default.riak.package.source_checksum = '844cdca59582658f3d16b94af0b3cbb5cd5274834b753ff85c5845b20c91ba2b'
default.riak.package.config_dir = "/etc/riak"
View
1  attributes/sysmon.rb
@@ -23,4 +23,3 @@
default.riak.sysmon.heap_word_limit = 40111000
default.riak.sysmon.busy_port = true
default.riak.sysmon.busy_dist_port = true
-
View
5 libraries/riak_template_helper.rb
@@ -56,7 +56,7 @@ def to_erlang_config(hash, depth = 1)
#There are several configurations that are not key/value. They should be added to KEYLESS_ATTRIBUTES.
#A sample of this wold be the lager configuration.
#{"{{platform_log_dir}}/error.log", error, 10485760, "$D0", 5}
- KEYLESS_ATTRIBUTES = ['lager_error_log','lager_console_log']
+ KEYLESS_ATTRIBUTES = ['lager_error_log','lager_console_log','userlist']
#Remove these configs. This will make sure package and erlang vms are not processed into the riak app.config.
RIAK_REMOVE_CONFIGS = ['package', 'erlang']
@@ -65,7 +65,8 @@ def to_erlang_config(hash, depth = 1)
'core' => 'riak_core',
'kv' => 'riak_kv',
'err' => 'riak_err',
- 'sysmon' => 'riak_sysmon'
+ 'sysmon' => 'riak_sysmon',
+ 'control' => 'riak_control'
}
def prepare_app_config(riak)
Please sign in to comment.
Something went wrong with that request. Please try again.