X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b4529349961ad098922592ac99c5ab2216f2b5d6..4495444126e0bfdf4d6655b5cbe9af1a7d29902f:/roles/imagery.rb

diff --git a/roles/imagery.rb b/roles/imagery.rb
index e1d4881a9..78437a608 100644
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -4,35 +4,21 @@ description "Role applied to all imagery servers"
 default_attributes(
   :accounts => {
     :users => {
+      :dmlu => { :status => :user },
       :htonl => { :status => :user },
+      :stereo => { :status => :administrator },
       :imagery => {
         :status => :role,
-        :members => [:grant, :tomh, :htonl]
+        :members => [:grant, :tomh, :dmlu, :htonl, :stereo ]
       }
     }
   },
-  :apt => {
-    :sources => ["nginx"]
-  },
   :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 => {
@@ -54,5 +40,8 @@ run_list(
   "recipe[imagery::gb_os_sv]",
   "recipe[imagery::gb_surrey_aerial]",
   "recipe[imagery::za_ngi_topo]",
-  "recipe[imagery::za_coct_aerial]"
+  "recipe[imagery::za_coct_aerial]",
+  "recipe[imagery::na_sgswa_topo]",
+  "recipe[imagery::lu_ngl_dtm]",
+  "recipe[imagery::lu_lidar_hillshade]"
 )