Tighten mod_evasive restrictions for the main site

[chef.git] / roles / ysera.rb

diff --git a/roles/ysera.rb b/roles/ysera.rb
index 3e537b264b039f1685e8fd1a80ba3c85e3932a21..889bf27e9a4443b58e248d21691936eed298ca7a 100644 (file)
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -4,26 +4,25 @@ description "Master role applied to ysera"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "eno1.2801",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.15"
+        :inet => {
+          :address => "10.0.0.15"
+        }
       },
-      :external_ipv4 => {
+      :external => {
         :interface => "eno1.2800",
         :role => :external,
-        :family => :inet,
-        :address => "193.60.236.22"
+        :inet => {
+          :address => "193.60.236.22"
+        }
       }
     }
   },
   :postgresql => {
-    :versions => ["10"],
     :settings => {
       :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
         :effective_cache_size => "16GB"
       }
     }
@@ -39,9 +38,10 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "10/main",
-      :postgis => "2.4"
+      :cluster => "16/main",
+      :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [