Restart dev service correctly when they change

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 3a12babae9d53062d15e6460d2ba4785a7c363e1..047a70d72115ea0ce1e9f67bd4bfa3b475f249f3 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -34,6 +34,10 @@ include_recipe "python"
 include_recipe "ruby"
 
 package %w[
+  ant
+  default-jdk-headless
+  default-jre-headless
+  golang
   composer
   php-apcu
   php-cgi
@@ -54,12 +58,21 @@ package %w[
   pngcrush
   pngquant
   python3
+  python3-brotli
   python3-bs4
   python3-cheetah
   python3-dateutil
+  python3-dev
+  python3-dotenv
+  python3-lxml
+  python3-lz4
   python3-magic
+  python3-pil
   python3-psycopg2
+  python3-pyproj
   python3-gdal
+  gdal-bin
+  proj-bin
   g++
   gcc
   make
@@ -70,6 +83,7 @@ package %w[
   libfcgi-dev
   libxml2-dev
   libmemcached-dev
+  libboost-dev
   libboost-regex-dev
   libboost-system-dev
   libboost-program-options-dev
@@ -83,8 +97,44 @@ package %w[
   zlib1g-dev
   nano
   osm2pgsql
+  osmosis
+  at
+  awscli
+  mailutils
+  lua-any
+  luajit
+  fonts-dejavu
+  fonts-dejavu-core
+  fonts-dejavu-extra
+  fonts-droid-fallback
+  fonts-liberation
+  fonts-noto-mono
+  gnuplot-nox
+  graphviz
+  irssi
+  jq
+  lz4
+  lzip
+  lzop
+  pbzip2
+  pigz
+  unrar
+  unzip
+  zip
+  netcat
+  tmux
+  whois
+  redis
+  r-base
+  pandoc
 ]
 
+# Add uk_os_OSTN15_NTv2_OSGBtoETRS.tif used for reprojecting OS data
+execute "uk_os_OSTN15_NTv2_OSGBtoETRS.tif" do
+  command "projsync --file uk_os_OSTN15_NTv2_OSGBtoETRS.tif --system-directory"
+  not_if { ::File.exist?("/usr/share/proj/uk_os_OSTN15_NTv2_OSGBtoETRS.tif") }
+end
+
 nodejs_package "svgo"
 
 python_package "geojson" do
@@ -214,6 +264,10 @@ search(:accounts, "*:*").each do |account|
   end
 end
 
+node[:postgresql][:versions].each do |version|
+  package "postgresql-#{version}-postgis-3"
+end
+
 if node[:postgresql][:clusters][:"14/main"]
   postgresql_user "apis" do
     cluster "14/main"
@@ -236,11 +290,8 @@ if node[:postgresql][:clusters][:"14/main"]
     exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"
     restart "on-failure"
     nice 10
-    private_tmp true
-    private_devices true
-    protect_system "full"
-    protect_home true
-    no_new_privileges true
+    sandbox :enable_network => true
+    read_write_paths "/srv/%i.apis.dev.openstreetmap.org/logs"
   end
 
   systemd_service "cgimap@" do
@@ -250,11 +301,9 @@ if node[:postgresql][:clusters][:"14/main"]
     user "apis"
     exec_start "/srv/%i.apis.dev.openstreetmap.org/cgimap/openstreetmap-cgimap --daemon --port $CGIMAP_PORT --instances 5"
     exec_reload "/bin/kill -HUP $MAINPID"
-    private_tmp true
-    private_devices true
-    protect_system "full"
-    protect_home true
-    no_new_privileges true
+    sandbox :enable_network => true
+    restrict_address_families "AF_UNIX"
+    read_write_paths ["/srv/%i.apis.dev.openstreetmap.org/logs", "/srv/%i.apis.dev.openstreetmap.org/rails/tmp"]
     restart "on-failure"
   end
 
@@ -349,7 +398,7 @@ if node[:postgresql][:clusters][:"14/main"]
         action [:enable, :start]
         supports :restart => true
         subscribes :restart, "rails_port[#{site_name}]"
-        subscribes :restart, "systemd_service[#{name}]"
+        subscribes :restart, "systemd_service[rails-jobs@]"
         only_if "fgrep -q delayed_job #{rails_directory}/Gemfile.lock"
       end
 
@@ -387,7 +436,6 @@ if node[:postgresql][:clusters][:"14/main"]
           user "apis"
           group "apis"
           subscribes :run, "execute[#{cgimap_directory}/configure]", :immediately
-          notifies :restart, "service[cgimap@#{name}]"
         end
 
         template "/etc/default/cgimap-#{name}" do
@@ -399,11 +447,13 @@ if node[:postgresql][:clusters][:"14/main"]
                     :database_port => node[:postgresql][:clusters][:"14/main"][:port],
                     :database_name => database_name,
                     :log_directory => log_directory
-          notifies :restart, "service[cgimap@#{name}]"
         end
 
         service "cgimap@#{name}" do
           action [:start, :enable]
+          subscribes :restart, "execute[#{cgimap_directory}/Makefile]"
+          subscribes :restart, "template[/etc/default/cgimap-#{name}]"
+          subscribes :restart, "systemd_service[cgimap@]"
         end
       end