Avoid double call to ip2region; consolidate rewrite conditions

[chef.git] / roles / palulukon.rb

diff --git a/roles/palulukon.rb b/roles/palulukon.rb
index 0a1adf68f2d87c96f14ea1fde94ebe7240d4c0eb..661febeb692e46b0152ad4d6f44b3ac60fd98855 100644 (file)
--- a/roles/palulukon.rb
+++ b/roles/palulukon.rb
@@ -22,8 +22,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {

-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",

         :effective_cache_size => "16GB"
       }
     }
         :effective_cache_size => "16GB"
       }
     }


@@ -39,7 +37,7 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "14/main",
+      :cluster => "16/main",

       :postgis => "3"
     },
     :mapnik => "3.1",
       :postgis => "3"
     },
     :mapnik => "3.1",