Merge remote-tracking branch 'github/pull/668'

[chef.git] / roles / palulukon.rb

diff --git a/roles/palulukon.rb b/roles/palulukon.rb
index 69183cb9eb56f66a2f736c5f5047d2e1957ab9a5..661febeb692e46b0152ad4d6f44b3ac60fd98855 100644 (file)
--- a/roles/palulukon.rb
+++ b/roles/palulukon.rb
@@ -3,23 +3,25 @@ description "Master role applied to palulukon"
 
 default_attributes(
   :networking => {
+    :firewall => {
+      :allowlist => ["172.31.0.2"]
+    },
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "ens5",
         :role => :external,
-        :family => :inet,
-        :address => "172.31.37.101",
-        :prefix => "20",
-        :gateway => "172.31.32.1",
-        :public_address => "3.144.0.72"
+        :inet => {
+          :address => "172.31.37.101",
+          :prefix => "20",
+          :gateway => "172.31.32.1",
+          :public_address => "3.144.0.72"
+        }
       }
     }
   },
   :postgresql => {
     :settings => {
       :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
         :effective_cache_size => "16GB"
       }
     }
@@ -35,7 +37,7 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "14/main",
+      :cluster => "16/main",
       :postgis => "3"
     },
     :mapnik => "3.1",