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

Fixes #83

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index d5e002d61a133151165dbd302b667c09cd280ceb..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 0o644
+  variables :archive_host => archive_host, :codename => node[:lsb][:codename]
   notifies :run, "execute[apt-update]", :immediately
 end
 

diff --git a/cookbooks/apt/templates/default/sources.list.erb b/cookbooks/apt/templates/default/sources.list.erb
index c6cdff57f3db711c0617effa52f89f062200065d..e572f7ced598e41f2b10d3607940ecab14d46dfb 100644 (file)
--- a/cookbooks/apt/templates/default/sources.list.erb
+++ b/cookbooks/apt/templates/default/sources.list.erb
@@ -1,30 +1,30 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-deb http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %> main restricted
-deb-src http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %> main restricted
+deb http://<%= @archive_host %>/ubuntu/ <%= @codename %> main restricted
+deb-src http://<%= @archive_host %>/ubuntu/ <%= @codename %> main restricted
 
 ## Major bug fix updates produced after the final release of the
 ## distribution.
-deb http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %>-updates main restricted
-deb-src http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %>-updates main restricted
+deb http://<%= @archive_host %>/ubuntu/ <%= @codename %>-updates main restricted
+deb-src http://<%= @archive_host %>/ubuntu/ <%= @codename %>-updates main restricted
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team. Also, please note that software in universe WILL NOT receive any
 ## review or updates from the Ubuntu security team.
-deb http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %> universe
-deb-src http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %> universe
-deb http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %>-updates universe
-deb-src http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %>-updates universe
+deb http://<%= @archive_host %>/ubuntu/ <%= @codename %> universe
+deb-src http://<%= @archive_host %>/ubuntu/ <%= @codename %> universe
+deb http://<%= @archive_host %>/ubuntu/ <%= @codename %>-updates universe
+deb-src http://<%= @archive_host %>/ubuntu/ <%= @codename %>-updates universe
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
 ## team, and may not be under a free licence. Please satisfy yourself as to 
 ## your rights to use the software. Also, please note that software in 
 ## multiverse WILL NOT receive any review or updates from the Ubuntu
 ## security team.
-deb http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %> multiverse
-deb-src http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %> multiverse
-deb http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %>-updates multiverse
-deb-src http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %>-updates multiverse
+deb http://<%= @archive_host %>/ubuntu/ <%= @codename %> multiverse
+deb-src http://<%= @archive_host %>/ubuntu/ <%= @codename %> multiverse
+deb http://<%= @archive_host %>/ubuntu/ <%= @codename %>-updates multiverse
+deb-src http://<%= @archive_host %>/ubuntu/ <%= @codename %>-updates multiverse
 
 ## Uncomment the following two lines to add software from the 'backports'
 ## repository.
@@ -33,19 +33,19 @@ deb-src http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.coden
 ## newer versions of some applications which may provide useful features.
 ## Also, please note that software in backports WILL NOT receive any review
 ## or updates from the Ubuntu security team.
-deb http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %>-backports main restricted universe multiverse
-deb-src http://<%= node.country %>.archive.ubuntu.com/ubuntu/ <%= node.lsb.codename %>-backports main restricted universe multiverse
+deb http://<%= @archive_host %>/ubuntu/ <%= @codename %>-backports main restricted universe multiverse
+deb-src http://<%= @archive_host %>/ubuntu/ <%= @codename %>-backports main restricted universe multiverse
 
 ## Uncomment the following two lines to add software from Canonical's
 ## 'partner' repository. This software is not part of Ubuntu, but is
 ## offered by Canonical and the respective vendors as a service to Ubuntu
 ## users.
-# deb http://archive.canonical.com/ubuntu <%= node.lsb.codename %> partner
-# deb-src http://archive.canonical.com/ubuntu <%= node.lsb.codename %> partner
+# deb http://archive.canonical.com/ubuntu <%= @codename %> partner
+# deb-src http://archive.canonical.com/ubuntu <%= @codename %> partner
 
-deb http://security.ubuntu.com/ubuntu <%= node.lsb.codename %>-security main restricted
-deb-src http://security.ubuntu.com/ubuntu <%= node.lsb.codename %>-security main restricted
-deb http://security.ubuntu.com/ubuntu <%= node.lsb.codename %>-security universe
-deb-src http://security.ubuntu.com/ubuntu <%= node.lsb.codename %>-security universe
-deb http://security.ubuntu.com/ubuntu <%= node.lsb.codename %>-security multiverse
-deb-src http://security.ubuntu.com/ubuntu <%= node.lsb.codename %>-security multiverse
+deb http://security.ubuntu.com/ubuntu <%= @codename %>-security main restricted
+deb-src http://security.ubuntu.com/ubuntu <%= @codename %>-security main restricted
+deb http://security.ubuntu.com/ubuntu <%= @codename %>-security universe
+deb-src http://security.ubuntu.com/ubuntu <%= @codename %>-security universe
+deb http://security.ubuntu.com/ubuntu <%= @codename %>-security multiverse
+deb-src http://security.ubuntu.com/ubuntu <%= @codename %>-security multiverse