Use archive.ubuntu.com if we don't know the country

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index e3787470a454b4cd13ade0f840d32fbc4c36bf9a..4243d565d1e2045839b8018802c0b7a689f2706a 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -29,11 +29,18 @@ 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
 
@@ -94,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
 
@@ -132,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
 
@@ -140,5 +147,5 @@ template "/etc/apt/apt.conf.d/60chef" do
   source "apt.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end