Fix more rubocop detected style issues

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 6fae55939b2ffecec9ef7092c323cf7bc4d694e5..127a5265b0d9fade6e5211a4302f61698efcd858 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -54,12 +54,12 @@ default_attributes(
     :versions => [ "9.3" ],
     :settings => {
       :defaults => {
     :versions => [ "9.3" ],
     :settings => {
       :defaults => {

-        :shared_buffers => "24GB",
+        :shared_buffers => "10GB",

         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "48GB",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "48GB",

-        :fsync => "off"
+        :fsync => "on"

       }
     }
   },
       }
     }
   },


@@ -67,19 +67,33 @@ default_attributes(
     :enabled => false,
     :flatnode_file => "/ssd-old/nominatim/nodes.store",
     :database => {
     :enabled => false,
     :flatnode_file => "/ssd-old/nominatim/nodes.store",
     :database => {

-        :cluster => "9.3/main",
-        :dbname => "nominatim",
-        :postgis => "2.1"
+      :cluster => "9.3/main",
+      :dbname => "nominatim",
+      :postgis => "2.1"

     },
     :fpm_pools => {
     },
     :fpm_pools => {

-        :www => {
-            :pm => "dynamic",
-            :max_children => "60"
-        },
-        :bulk => {
-            :pm => "static",
-            :max_children => "10"
-        }
+      :www => {
+        :port => "8000",
+        :pm => "dynamic",
+        :max_children => "60"
+      },
+      :bulk => {
+        :port => "8001",
+        :pm => "static",
+        :max_children => "10"
+      }
+    },
+    :tablespaces => {
+      "Osm2pgsql_Data" => "aux",
+      "Osm2pgsql_Index" => "data",
+      "Place_Data" => "ssd2",
+      "Place_Index" => "ssd1",
+      "Address_Data" => "ssd2",
+      "Address_Index" => "ssd1",
+      "Search_Data" => "ssd1",
+      "Search_Index" => "ssd1",
+      "Aux_Data" => "aux",
+      "Aux_Index" => "aux"

     }
   }
 )
     }
   }
 )