nominatim: add postgres/postgis version information in local settings

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index d41e322a31f2710b68f967dc6c34bca3cd82d6be..65da50c5456cfbe628451563ad2381255f042501 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -178,6 +178,7 @@ template "#{source_directory}/settings/local.php" do
   owner "nominatim"
   group "nominatim"
   mode 0664
   owner "nominatim"
   group "nominatim"
   mode 0664

+  variables :postgres_version => database_version

 end
 
 template "#{source_directory}/settings/ip_blocks.conf" do
 end
 
 template "#{source_directory}/settings/ip_blocks.conf" do

diff --git a/cookbooks/nominatim/templates/default/nominatim.erb b/cookbooks/nominatim/templates/default/nominatim.erb
index d36523d851df958af7ac82cae9d4ad2650e6a7d0..d05c8f558465f2a24617c287a56181c6f71b129d 100644 (file)
--- a/cookbooks/nominatim/templates/default/nominatim.erb
+++ b/cookbooks/nominatim/templates/default/nominatim.erb
@@ -7,3 +7,5 @@ if (isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']))
 else
     @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
 
 else
     @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
 

+@define('CONST_Postgresql_Version', '<%= @postgres_version %>');
+@define('CONST_Postgis_Version', '<%= node[:nominatim][:database][:postgis] %>');