X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ab47927c016597f8602b81dcdc168ad5c335389d..eeb6af1577533491ede21b6661803a5870b28e6f:/roles/imagery.rb

diff --git a/roles/imagery.rb b/roles/imagery.rb
index 3cc42a718..4a4a033a3 100644
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -6,7 +6,7 @@ default_attributes(
     :users => {
       :dmlu => { :status => :user },
       :htonl => { :status => :user },
-      :stereo => { :status => :user },
+      :stereo => { :status => :administrator },
       :imagery => {
         :status => :role,
         :members => [:grant, :tomh, :dmlu, :htonl, :stereo ]
@@ -19,29 +19,14 @@ default_attributes(
       :parameters => {
         "net.core.somaxconn" => 10000
       }
-    },
-    :kernel_scheduler_tune => {
-      :comment => "Tune kernel scheduler preempt",
-      :parameters => {
-        "kernel.sched_min_granularity_ns" => 10000000,
-        "kernel.sched_wakeup_granularity_ns" => 15000000
-      }
-    }
-  },
-  :nginx => {
-    :cache => {
-      :fastcgi => {
-        :enable => true,
-        :keys_zone => "fastcgi_cache_zone:256M",
-        :inactive => "45d",
-        :max_size => "51200M"
-      }
     }
   }
 )
 
 run_list(
   "recipe[imagery::au_agri]",
+  "recipe[imagery::au_act_aerial]",
+  "recipe[imagery::au_vic_melbourne_aerial]",
   "recipe[imagery::gb_ea]",
   "recipe[imagery::gb_hampshire_aerial]",
   "recipe[imagery::gb_os_sv]",
@@ -50,5 +35,7 @@ run_list(
   "recipe[imagery::za_coct_aerial]",
   "recipe[imagery::na_sgswa_topo]",
   "recipe[imagery::lu_ngl_dtm]",
-  "recipe[imagery::lu_lidar_hillshade]"
+  "recipe[imagery::lu_lidar_hillshade]",
+  "recipe[imagery::za_ngi_aerial]",
+  "recipe[imagery::us_imagery]"
 )