Merge pull request #331 from Tigerfell/tiles

[chef.git] / cookbooks / elasticsearch / recipes / default.rb

diff --git a/cookbooks/elasticsearch/recipes/default.rb b/cookbooks/elasticsearch/recipes/default.rb
index 41ea68a1260ef97ee81c0acf27239824476e55db..cd7e8ff0165cea04d206aed537d2e43535bedbe3 100644 (file)
--- a/cookbooks/elasticsearch/recipes/default.rb
+++ b/cookbooks/elasticsearch/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: elasticsearch
+# Cookbook:: elasticsearch
 # Recipe:: default
 #
-# Copyright 2014, OpenStreetMap Foundation
+# Copyright:: 2014, OpenStreetMap Foundation
 #
 # 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
+#     https://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,
@@ -17,12 +17,20 @@
 # limitations under the License.
 #
 
-package "openjdk-7-jre-headless"
-package "elasticsearch" do
-  action :install
+include_recipe "apt"
+
+package "default-jre-headless"
+package "elasticsearch"
+
+template "/etc/elasticsearch/elasticsearch.yml" do
+  source "elasticsearch.yml.erb"
+  user "root"
+  group "root"
+  mode "644"
+  notifies :restart, "service[elasticsearch]"
 end
 
 service "elasticsearch" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true
 end