X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9624adf7d7b57952b4bba023188bde37c0c4730a..84779438f30113a370b0d48ee01bcbe22babb744:/roles/imagery.rb

diff --git a/roles/imagery.rb b/roles/imagery.rb
index 898e0dcdf..cc4dc454c 100644
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -6,35 +6,19 @@ default_attributes(
     :users => {
       :dmlu => { :status => :user },
       :htonl => { :status => :user },
-      :stereo => { :status => :user },
+      :stereo => { :status => :administrator },
       :imagery => {
         :status => :role,
         :members => [:grant, :tomh, :dmlu, :htonl, :stereo ]
       }
     }
   },
-  :apt => {
-    :sources => %w[ubuntugis-unstable]
-  },
   :sysctl => {
     :sockets => {
       :comment => "Increase size of connection queue",
       :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
-      }
-    },
-    :kernel_tfo_listen_enable => {
-      :comment => "Enable TCP Fast Open for listening sockets",
-      :parameters => {
-        "net.ipv4.tcp_fastopen" => 3
-      }
     }
   },
   :nginx => {
@@ -51,6 +35,7 @@ default_attributes(
 
 run_list(
   "recipe[imagery::au_agri]",
+  "recipe[imagery::au_act_aerial]",
   "recipe[imagery::gb_ea]",
   "recipe[imagery::gb_hampshire_aerial]",
   "recipe[imagery::gb_os_sv]",
@@ -59,5 +44,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]"
 )