]> git.openstreetmap.org Git - chef.git/commitdiff
nominatim: remove old php settings
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 30 Dec 2020 15:15:49 +0000 (16:15 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 30 Dec 2020 15:15:49 +0000 (16:15 +0100)
cookbooks/nominatim/recipes/default.rb
cookbooks/nominatim/templates/default/settings.erb [deleted file]

index d2fc8ec2c861960ea22758fce6207d0e110328a2..a26f1862b3d9dc219394d79dd364143234ed42c0 100644 (file)
@@ -217,17 +217,6 @@ template "#{source_directory}/.git/hooks/post-merge" do
             :dbname => node[:nominatim][:dbname]
 end
 
-template "#{build_directory}/settings/local.php" do
-  source "settings.erb"
-  owner "nominatim"
-  group "nominatim"
-  mode "664"
-  variables :base_url => node[:nominatim][:state] == "off" ? node[:fqdn] : "nominatim.openstreetmap.org",
-            :dbname => node[:nominatim][:dbname],
-            :flatnode_file => node[:nominatim][:flatnode_file],
-            :log_file => "#{node[:nominatim][:logdir]}/query.log"
-end
-
 template "#{build_directory}/.env" do
   source "nominatim.env.erb"
   owner "nominatim"
diff --git a/cookbooks/nominatim/templates/default/settings.erb b/cookbooks/nominatim/templates/default/settings.erb
deleted file mode 100644 (file)
index 3d042df..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-# DO NOT EDIT - This file is being maintained by Chef
-
-@define('CONST_Database_DSN', 'pgsql:dbname=<%= @dbname %>');
-@define('CONST_Website_BaseURL', 'https://<%= @base_url %>/');
-@define('CONST_MapIcon_URL', 'https://<%= @base_url %>/ui/mapicons/');
-
-<% if @flatnode_file -%>
-@define('CONST_Osm2pgsql_Flatnode_File', '<%= @flatnode_file %>');
-<% end -%>
-@define('CONST_Search_NameOnlySearchFrequencyThreshold', 500);
-
-@define('CONST_Import_Style', CONST_BasePath.'/settings/import-extratags.style');
-
-@define('CONST_Use_US_Tiger_Data', true);
-
-@define('CONST_Tablespace_Osm2pgsql_Data', 'dosm');
-@define('CONST_Tablespace_Osm2pgsql_Index', 'iosm');
-@define('CONST_Tablespace_Place_Data', 'dplace');
-@define('CONST_Tablespace_Place_Index', 'iplace');
-@define('CONST_Tablespace_Address_Data', 'daddress');
-@define('CONST_Tablespace_Address_Index', 'iaddress');
-@define('CONST_Tablespace_Search_Data', 'dsearch');
-@define('CONST_Tablespace_Search_Index', 'isearch');
-@define('CONST_Tablespace_Aux_Data', 'daux');
-@define('CONST_Tablespace_Aux_Index', 'iaux');
-
-@define('CONST_Log_File', '<%= @log_file %>');
-@define('CONST_Log_DB', false);