X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/aebc9980eafb3e523e36023022186a5da64ca5ac..9624adf7d7b57952b4bba023188bde37c0c4730a:/roles/imagery.rb?ds=inline

diff --git a/roles/imagery.rb b/roles/imagery.rb
index 9106f9329..898e0dcdf 100644
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -4,15 +4,17 @@ description "Role applied to all imagery servers"
 default_attributes(
   :accounts => {
     :users => {
+      :dmlu => { :status => :user },
       :htonl => { :status => :user },
+      :stereo => { :status => :user },
       :imagery => {
         :status => :role,
-        :members => [:grant, :tomh, :htonl]
+        :members => [:grant, :tomh, :dmlu, :htonl, :stereo ]
       }
     }
   },
   :apt => {
-    :sources => ["nginx"]
+    :sources => %w[ubuntugis-unstable]
   },
   :sysctl => {
     :sockets => {
@@ -27,12 +29,21 @@ default_attributes(
         "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 => {
     :cache => {
       :fastcgi => {
-        :enable => true
+        :enable => true,
+        :keys_zone => "fastcgi_cache_zone:256M",
+        :inactive => "45d",
+        :max_size => "51200M"
       }
     }
   }
@@ -40,7 +51,13 @@ default_attributes(
 
 run_list(
   "recipe[imagery::au_agri]",
+  "recipe[imagery::gb_ea]",
   "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]",
+  "recipe[imagery::lu_ngl_dtm]",
+  "recipe[imagery::lu_lidar_hillshade]"
 )