From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 9 Mar 2019 10:57:33 +0000 (+0100)
Subject: nominatim: adapt to new DSN format
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/2c757a2fd949081d5a4d92db6cc719d0147f7d00?ds=sidebyside

nominatim: adapt to new DSN format
---

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 5d73390fc..220363a2a 100644
--- 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 ec627d6a5..18858ca07 100644
--- 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 -%>