Revert "Move AMS gateway to tabaluga"

[chef.git] / roles / imagery.rb

diff --git a/roles/imagery.rb b/roles/imagery.rb
index 9106f932995bf7ff552411bfead1d4de74c3a482..78437a60887c44aee95b45b52aa99d9b4cf8d519 100644 (file)
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -4,35 +4,30 @@ description "Role applied to all imagery servers"
 default_attributes(
   :accounts => {
     :users => {
 default_attributes(
   :accounts => {
     :users => {

+      :dmlu => { :status => :user },

       :htonl => { :status => :user },
       :htonl => { :status => :user },

+      :stereo => { :status => :administrator },

       :imagery => {
         :status => :role,
       :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
       }
   :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
-      }

     }
   },
   :nginx => {
     :cache => {
       :fastcgi => {
     }
   },
   :nginx => {
     :cache => {
       :fastcgi => {

-        :enable => true
+        :enable => true,
+        :keys_zone => "fastcgi_cache_zone:256M",
+        :inactive => "45d",
+        :max_size => "51200M"

       }
     }
   }
       }
     }
   }


@@ -40,7 +35,13 @@ default_attributes(
 
 run_list(
   "recipe[imagery::au_agri]",
 
 run_list(
   "recipe[imagery::au_agri]",

+  "recipe[imagery::gb_ea]",

   "recipe[imagery::gb_hampshire_aerial]",
   "recipe[imagery::gb_os_sv]",
   "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]"

 )
 )