X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1362b4f85261e2181197e83c94e989b39f15f3a6..204605749875101d3316aa94917d0a4b6c055fb3:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 57c279cd6..508030bf2 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -17,9 +17,11 @@
 # limitations under the License.
 #
 
-package "apt"
-package "gnupg-curl"
-package "update-notifier-common"
+package %w[
+  apt
+  gnupg-curl
+  update-notifier-common
+]
 
 file "/etc/motd.tail" do
   action :delete
@@ -96,12 +98,24 @@ apt_source "nginx" do
   key "ABF5BD827BD9BF62"
 end
 
-apt_source "elasticsearch" do
+apt_source "elasticsearch1.7" do
   source_template "elasticsearch.list.erb"
   url "http://packages.elasticsearch.org/elasticsearch/1.7/debian"
   key "D27D666CD88E42B4"
 end
 
+apt_source "elasticsearch2.x" do
+  source_template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/elasticsearch/2.x/debian"
+  key "D27D666CD88E42B4"
+end
+
+apt_source "elasticsearch5.x" do
+  source_template "elasticsearch.list.erb"
+  url "https://artifacts.elastic.co/packages/5.x/apt"
+  key "D27D666CD88E42B4"
+end
+
 apt_source "logstash" do
   source_template "elasticsearch.list.erb"
   url "http://packages.elasticsearch.org/logstash/2.3/debian"