Support a solr.rb config file for chef-solr

mdxp · Jun 13, 2010 · 5cb8d67 · 5cb8d67
1 parent 4170158
commit 5cb8d67
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/chef/attributes/default.rb b/chef/attributes/default.rb
@@ -43,6 +43,7 @@
 set_unless[:chef][:server_port]     = "4000"
 set_unless[:chef][:webui_port]      = "4040"
 set_unless[:chef][:webui_enabled]   = false
+set_unless[:chef][:solr_heap_size]  = "256M"
 set_unless[:chef][:validation_client_name] = "chef-validator"
 
 set_unless[:chef][:server_fqdn]     = node.has_key?(:domain) ? "chef.#{domain}" : "chef"

diff --git a/chef/recipes/bootstrap_server.rb b/chef/recipes/bootstrap_server.rb
@@ -76,11 +76,13 @@
   end
 end
 
-template "/etc/chef/server.rb" do
-  source "server.rb.erb"
-  owner "root"
-  group root_group
-  mode "600"
+%w{ server solr }.each do |cfg|
+  template "/etc/chef/#{cfg}.rb" do
+    source "#{cfg}.rb.erb"
+    owner "root"
+    group root_group
+    mode "600"
+  end
 end
 
 %w{ cache search_index }.each do |dir|