X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7117b830c7c0069ff9591147f52ce15c1bf2c79a..21f5884a7d9bd769366a222e33df989444517785:/roles/imagery.rb?ds=sidebyside diff --git a/roles/imagery.rb b/roles/imagery.rb index 16195af6f..3cc42a718 100644 --- a/roles/imagery.rb +++ b/roles/imagery.rb @@ -4,16 +4,15 @@ 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"] - }, :sysctl => { :sockets => { :comment => "Increase size of connection queue", @@ -27,12 +26,6 @@ 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 => { @@ -49,7 +42,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]" )