Add logrotate where required

[chef.git] / roles / imagery.rb

diff --git a/roles/imagery.rb b/roles/imagery.rb
index f243f44c0cbc8921804b75a8dbb32b51a81dd7d1..d6caa11e9fb3f02f0a434d6dace9c662869388dc 100644 (file)
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -6,7 +6,7 @@ default_attributes(
     :users => {
       :dmlu => { :status => :user },
       :htonl => { :status => :user },
     :users => {
       :dmlu => { :status => :user },
       :htonl => { :status => :user },

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

       :imagery => {
         :status => :role,
         :members => [:grant, :tomh, :dmlu, :htonl, :stereo ]
       :imagery => {
         :status => :role,
         :members => [:grant, :tomh, :dmlu, :htonl, :stereo ]


@@ -19,19 +19,6 @@ default_attributes(
       :parameters => {
         "net.core.somaxconn" => 10000
       }
       :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 => {
     }
   },
   :nginx => {


@@ -56,5 +43,7 @@ run_list(
   "recipe[imagery::za_coct_aerial]",
   "recipe[imagery::na_sgswa_topo]",
   "recipe[imagery::lu_ngl_dtm]",
   "recipe[imagery::za_coct_aerial]",
   "recipe[imagery::na_sgswa_topo]",
   "recipe[imagery::lu_ngl_dtm]",

-  "recipe[imagery::lu_lidar_hillshade]"
+  "recipe[imagery::lu_lidar_hillshade]",
+  "recipe[imagery::za_ngi_aerial]",
+  "recipe[imagery::us_imagery]"

 )
 )