fix || being or in attributes

phamvanhung2e123 · Dec 10, 2013 · d755e12 · d755e12
1 parent 6379901
commit d755e12
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/attributes/dbconfig.rb b/attributes/dbconfig.rb
@@ -3,22 +3,22 @@
 # dump anything into default['mongodb']['config'][<setting>] = <value>
 # these options are in the order of mongodb docs
 
-default['mongodb']['config']['port'] = node['mongodb']['port'] or 27017
-default['mongodb']['config']['bind_ip'] = node['mongodb']['bind_ip'] or "0.0.0.0"
+default['mongodb']['config']['port'] = node['mongodb']['port'] || 27017
+default['mongodb']['config']['bind_ip'] = node['mongodb']['bind_ip'] || "0.0.0.0"
 default['mongodb']['config']['logpath'] = File.join(node['mongodb']['logpath'], "mongodb.log")
 default['mongodb']['config']['logappend'] = true
 if node.platform_family?("rhel", "fedora") then
     default['mongodb']['config']['fork'] = true
 else
     default['mongodb']['config']['fork'] = false
 end
-default['mongodb']['config']['dbpath'] = node['mongodb']['dbpath'] or "/var/lib/mongodb"
-default['mongodb']['config']['nojournal'] = node['mongodb']['nojournal'] or false
-default['mongodb']['config']['rest'] = node['mongodb']['enable_rest'] or false
-default['mongodb']['config']['smallfiles'] = node['mongodb']['smallfiles'] or false
-default['mongodb']['config']['oplogSize'] = node['mongodb']['oplog_size'] or nil
+default['mongodb']['config']['dbpath'] = node['mongodb']['dbpath'] || "/var/lib/mongodb"
+default['mongodb']['config']['nojournal'] = node['mongodb']['nojournal'] || false
+default['mongodb']['config']['rest'] = node['mongodb']['enable_rest'] || false
+default['mongodb']['config']['smallfiles'] = node['mongodb']['smallfiles'] || false
+default['mongodb']['config']['oplogSize'] = node['mongodb']['oplog_size'] || nil
 
-default['mongodb']['config']['replSet'] = node['mongodb']['replicaset_name'] or nil
+default['mongodb']['config']['replSet'] = node['mongodb']['replicaset_name'] || nil
 if node['mongodb']['key_file'] then
     default['mongodb']['config']['keyFile'] = "/etc/mongodb.key"
 end
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -49,7 +49,7 @@
 default[:mongodb][:init_script_template] = "debian-mongodb.init.erb"
 default[:mongodb][:sysconfig_file] = "/etc/default/mongodb"
 default[:mongodb][:sysconfig_file_template] = "mongodb.sysconfig.erb"
-default[:mongodb][:dbconfig_file] = node[:mongodb][:configfile] or "/etc/mongodb.conf"
+default[:mongodb][:dbconfig_file] = node[:mongodb][:configfile] || "/etc/mongodb.conf"
 default[:mongodb][:dbconfig_file_template] = "mongodb.conf.erb"
 default[:mongodb][:package_name] = "mongodb"