X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2c757a2fd949081d5a4d92db6cc719d0147f7d00..de36e6558743eebc1185d32fa0b58dbafe9bbc53:/cookbooks/nominatim/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 220363a2a..63fe2ca06 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: nominatim +# Cookbook:: nominatim # Recipe:: base # -# Copyright 2015, OpenStreetMap Foundation +# Copyright:: 2015, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -55,7 +55,6 @@ include_recipe "postgresql" postgresql_version = node[:nominatim][:dbcluster].split("/").first postgis_version = node[:nominatim][:postgis] -package "postgis" package "postgresql-#{postgresql_version}-postgis-#{postgis_version}" node[:nominatim][:dbadmins].each do |user| @@ -109,7 +108,7 @@ node[:nominatim][:tablespaces].each do |name, location| end end -if node[:nominatim][:state] == "master" # ~FC023 +if node[:nominatim][:state] == "master" postgresql_user "replication" do cluster node[:nominatim][:dbcluster] password data_bag_item("nominatim", "passwords")["replication"] @@ -151,6 +150,7 @@ package %w[ libpq-dev libgeos++-dev libproj-dev + python3-pyosmium pyosmium ] @@ -208,7 +208,7 @@ template "#{build_directory}/settings/local.php" do :log_file => "#{node[:nominatim][:logdir]}/query.log" end -if node[:nominatim][:flatnode_file] # ~FC023 +if node[:nominatim][:flatnode_file] directory File.dirname(node[:nominatim][:flatnode_file]) do recursive true end