Specify database for osm2pgsql on rendering servers

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index e6bc74e7393ea74ef541e6a2e2141f99ab0e703b..379e35f20f383070490fdfc1fc7dd19723cbe17c 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -55,42 +55,10 @@ default_attributes(
         :address => "2001:630:12:500:2e0:81ff:fec5:333e"
       }
     }
-  },
-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :work_mem => "160MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "40GB",
-        :fsync => "on"
-      }
-    }
-  },
-  :nominatim => {
-    :flatnode_file => "/ssd-old/nominatim/nodes.store",
-    :database => {
-      :cluster => "9.3/main",
-      :dbname => "nominatim",
-      :postgis => "2.1"
-    },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      }
-    }
   }
 )
 
 run_list(
   "role[ic]",
-  "role[tyan-s7010]",
-  "role[nominatim-slave]"
+  "role[tyan-s7010]"
 )