Add logrotate where required

[chef.git] / roles / imagery.rb

diff --git a/roles/imagery.rb b/roles/imagery.rb
index ba300985290829f01ef2a674c8ac09d72f22e44e..d6caa11e9fb3f02f0a434d6dace9c662869388dc 100644 (file)
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -4,29 +4,21 @@ 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 => {
     }
   },
   :nginx => {


@@ -43,7 +35,15 @@ 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]",
+  "recipe[imagery::za_ngi_aerial]",
+  "recipe[imagery::us_imagery]"

 )
 )