Fix alerting for failed chef runs

[chef.git] / cookbooks / nominatim / recipes / default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 865b35f898422ddd63867b6f3ef66118ce690844..44bf649eac9a2cbcd7a8faa2c2d92953e6527b67 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -132,6 +132,7 @@ package %w[
   libpq-dev
   libproj-dev
   liblua5.3-dev
   libpq-dev
   libproj-dev
   liblua5.3-dev

+  libluajit-5.1-dev

   lua5.3
   python3-pyosmium
   python3-psycopg2
   lua5.3
   python3-pyosmium
   python3-psycopg2


@@ -141,6 +142,9 @@ package %w[
   python3-icu
   python3-datrie
   python3-yaml
   python3-icu
   python3-datrie
   python3-yaml

+  python3-sqlalchemy-ext
+  python3-geoalchemy2
+  python3-asyncpg

   php-pgsql
   php-intl
   ruby
   php-pgsql
   php-intl
   ruby


@@ -179,6 +183,17 @@ if node[:nominatim][:flatnode_file]
   end
 end
 
   end
 end
 

+remote_directory "#{project_directory}/website" do
+  source "website"
+  owner "nominatim"
+  group "nominatim"
+  mode "755"
+  files_owner "nominatim"
+  files_group "nominatim"
+  files_mode "644"
+  purge false
+end
+

 # Normally syncing via chef is a bad idea because syncing might involve
 # an update of database functions which should not be done while an update
 # is ongoing. Therefore we sync in between update cycles. There is an
 # Normally syncing via chef is a bad idea because syncing might involve
 # an update of database functions which should not be done while an update
 # is ongoing. Therefore we sync in between update cycles. There is an


@@ -197,7 +212,7 @@ end
 
 remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
   action :create_if_missing
 
 remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
   action :create_if_missing

-  source "https://www.nominatim.org/data/country_grid.sql.gz"
+  source "https://nominatim.org/data/country_grid.sql.gz"

   owner "nominatim"
   group "nominatim"
   mode "644"
   owner "nominatim"
   group "nominatim"
   mode "644"


@@ -207,7 +222,7 @@ execute "compile_nominatim" do
   action :nothing
   user "nominatim"
   cwd build_directory
   action :nothing
   user "nominatim"
   cwd build_directory

-  command "cmake #{source_directory} && make"
+  command "cmake -D WITH_LUAJIT=ON #{source_directory} && make"

   notifies :run, "execute[install_nominatim]"
 end
 
   notifies :run, "execute[install_nominatim]"
 end
 


@@ -234,7 +249,7 @@ end
 
 remote_file "#{project_directory}/wikimedia-importance.sql.gz" do
   action :create_if_missing
 
 remote_file "#{project_directory}/wikimedia-importance.sql.gz" do
   action :create_if_missing

-  source "https://www.nominatim.org/data/wikimedia-importance.sql.gz"
+  source "https://nominatim.org/data/wikimedia-importance.sql.gz"

   owner "nominatim"
   group "nominatim"
   mode "644"
   owner "nominatim"
   group "nominatim"
   mode "644"


@@ -243,7 +258,7 @@ end
 %w[gb_postcodes.csv.gz us_postcodes.csv.gz].each do |fname|
   remote_file "#{project_directory}/#{fname}" do
     action :create
 %w[gb_postcodes.csv.gz us_postcodes.csv.gz].each do |fname|
   remote_file "#{project_directory}/#{fname}" do
     action :create

-    source "https://www.nominatim.org/data/#{fname}"
+    source "https://nominatim.org/data/#{fname}"

     owner "nominatim"
     group "nominatim"
     mode "644"
     owner "nominatim"
     group "nominatim"
     mode "644"