Fix allowed paths for tile expiry

[chef.git] / roles / pyrene.rb

diff --git a/roles/pyrene.rb b/roles/pyrene.rb
index b3bee0f770bfa0d64cd31ad42ad6e182ca95a533..ff1b2fc4b7519542f53064652097ee3026db9fc0 100644 (file)
--- a/roles/pyrene.rb
+++ b/roles/pyrene.rb
@@ -2,14 +2,21 @@ name "pyrene"
 description "Master role applied to pyrene"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :munin => {
     :plugins => {
       :hpasmcli2_temp => {
         :temp15 => { :warning => "59.5", :critical => "70" },
         :temp17 => { :warning => "59.5", :critical => "70" }
+      },
+      :hpasmcli2_fans => {
+        :fan1 => { :warning => "95", :critical => "100" },
+        :fan2 => { :warning => "95", :critical => "100" },
+        :fan3 => { :warning => "95", :critical => "100" },
+        :fan4 => { :warning => "95", :critical => "100" },
+        :fan5 => { :warning => "95", :critical => "100" },
+        :fan6 => { :warning => "95", :critical => "100" },
+        :fan7 => { :warning => "95", :critical => "100" },
+        :fan8 => { :warning => "95", :critical => "100" }
       }
     }
   },
@@ -30,7 +37,6 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -50,16 +56,20 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "10/main",
-      :postgis => "2.4"
+      :cluster => "14/main",
+      :postgis => "3"
     },
-    :node_file => "/store/database/nodes",
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
       }
+    },
+    :ratelimit => {
+      :requests_per_second => 30,
+      :maximum_backlog => 3600
     }
   }
 )