X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6268f461956863e0838b52b8342e1ec57aec8226..a0dc01a655a52d168feb2b2791cee9b71aa58f54:/cookbooks/apt/recipes/default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 6f36c099d..4243d565d 100644
--- 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
 
@@ -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