nominatim: adapt to new DSN format

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 5d73390fcc92eb8f27e3a4e692211440740bf618..220363a2a4614f360f9648f5854541b683a4ea23 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -316,8 +316,6 @@ include_recipe "apache"
 package "php"
 package "php-fpm"
 package "php-pgsql"
-package "php-pear"
-package "php-db"
 package "php-intl"
 
 apache_module "rewrite"

diff --git a/cookbooks/nominatim/templates/default/settings.erb b/cookbooks/nominatim/templates/default/settings.erb
index ec627d6a5cf7b03c222d3b802a9b780c59a238c4..18858ca07067cbd23a719e5ba61bede78ee58df7 100644 (file)
--- a/cookbooks/nominatim/templates/default/settings.erb
+++ b/cookbooks/nominatim/templates/default/settings.erb
@@ -1,7 +1,7 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
 
-@define('CONST_Database_DSN', 'pgsql://@/<%= @dbname %>');
+@define('CONST_Database_DSN', 'pgsql:dbname=<%= @dbname %>');
 @define('CONST_Website_BaseURL', 'https://<%= @base_url %>/');
 
 <% if @flatnode_file -%>