X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/47d62e18357b8697a1e1f1e01c5617247ec5e69d..d5112ae724a15255983df81f9fda474c05925deb:/roles/dulcy.rb?ds=sidebyside diff --git a/roles/dulcy.rb b/roles/dulcy.rb index 50e4d3b2d..a1e930e78 100644 --- a/roles/dulcy.rb +++ b/roles/dulcy.rb @@ -1,6 +1,5 @@ name "dulcy" -description "Master role applied to dulcy -" +description "Master role applied to dulcy" default_attributes( :networking => { @@ -28,7 +27,7 @@ default_attributes( } }, :postgresql => { - :versions => ["9.4"], + :versions => ["9.5"], :settings => { :defaults => { :work_mem => "300MB", @@ -40,25 +39,23 @@ default_attributes( } }, :nominatim => { - :enabled => false, + :state => "standalone", + :enable_backup => false, + :dbadmins => %w(lonvia tomh), + :dbcluster => "9.5/main", :flatnode_file => "/ssd/nominatim/nodes.store", :logdir => "/ssd/nominatim/log", - :database => { - :cluster => "9.4/main", - :dbname => "nominatim", - :postgis => "2.1" - }, - :fpm_pools => { - :www => { - :port => "8000", - :pm => "dynamic", - :max_children => "60" - }, - :bulk => { - :port => "8001", - :pm => "static", - :max_children => "10" - } + :tablespaces => { + "dosm" => "/ssd/tablespaces/dosm", + "iosm" => "/ssd/tablespaces/iosm", + "dplace" => "/ssd/tablespaces/dplace", + "iplace" => "/ssd/tablespaces/iplace", + "daddress" => "/ssd/tablespaces/daddress", + "iaddress" => "/ssd/tablespaces/iaddress", + "dsearch" => "/ssd/tablespaces/dsearch", + "isearch" => "/ssd/tablespaces/isearch", + "daux" => "/ssd/tablespaces/daux", + "iaux" => "/ssd/tablespaces/iaux" } }, :sysfs => { @@ -74,5 +71,5 @@ default_attributes( run_list( "role[ic]", - "role[nominatim-standalone]" + "role[nominatim]" )