X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/0bbf2c3b8998e11330a2dbc1211b08a39c2ab3e5..1e77b3e20f68bd4baa3cb8bb6e2fe9ba727055e5:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index e0e000c3a..4243d565d 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -29,17 +29,30 @@ execute "apt-update" do
   command "/usr/bin/apt-get update"
 end
 
+archive_host = if node[:country]
+                 "#{node[:country]}.archive.ubuntu.com"
+               else
+                 "archive.ubuntu.com"
+               end
+
 template "/etc/apt/sources.list" do
   source "sources.list.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
+  variables :archive_host => archive_host, :codename => node[:lsb][:codename]
   notifies :run, "execute[apt-update]", :immediately
 end
 
-apt_source "brightbox-ruby-ng" do
-  url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu"
-  key "C3173AA6"
+if node[:lsb][:release].to_f >= 16.04
+  apt_source "brightbox-ruby-ng" do
+    action :delete
+  end
+else
+  apt_source "brightbox-ruby-ng" do
+    url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu"
+    key "C3173AA6"
+  end
 end
 
 apt_source "ubuntugis-stable" do
@@ -53,7 +66,6 @@ apt_source "ubuntugis-unstable" do
 end
 
 apt_source "openstreetmap" do
-  template "openstreetmap.list.erb"
   url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
   key "0AC4F2CB"
 end
@@ -89,7 +101,7 @@ end
 
 apt_source "logstash" do
   template "elasticsearch.list.erb"
-  url "http://packages.elasticsearch.org/logstash/1.5/debian"
+  url "http://packages.elasticsearch.org/logstash/2.3/debian"
   key "D88E42B4"
 end
 
@@ -127,7 +139,7 @@ auto_upgrades = if node[:apt][:unattended_upgrades][:enable]
 file "/etc/apt/apt.conf.d/20auto-upgrades" do
   user "root"
   group "root"
-  mode 0644
+  mode 0o644
   content auto_upgrades
 end
 
@@ -135,5 +147,5 @@ template "/etc/apt/apt.conf.d/60chef" do
   source "apt.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end