Improve check for whether to run freshclam

[chef.git] / roles / imagery.rb

diff --git a/roles/imagery.rb b/roles/imagery.rb
index 16195af6fc0bfa976e946f539928dd58f3522e9a..fedd79afc43b7fbd21aa79780b229113f1cc0a40 100644 (file)
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -12,7 +12,7 @@ default_attributes(
     }
   },
   :apt => {
     }
   },
   :apt => {

-    :sources => ["nginx"]
+    :sources => %w[nginx ubuntugis-unstable]

   },
   :sysctl => {
     :sockets => {
   },
   :sysctl => {
     :sockets => {


@@ -49,7 +49,11 @@ default_attributes(
 
 run_list(
   "recipe[imagery::au_agri]",
 
 run_list(
   "recipe[imagery::au_agri]",

+  "recipe[imagery::gb_ea]",

   "recipe[imagery::gb_hampshire_aerial]",
   "recipe[imagery::gb_os_sv]",
   "recipe[imagery::gb_hampshire_aerial]",
   "recipe[imagery::gb_os_sv]",

-  "recipe[imagery::gb_surrey_aerial]"
+  "recipe[imagery::gb_surrey_aerial]",
+  "recipe[imagery::za_ngi_topo]",
+  "recipe[imagery::za_coct_aerial]",
+  "recipe[imagery::na_sgswa_topo]"

 )
 )