Revert "nominatim: improve IP query block expression"

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 3a708a018c413c15910e54bb67881c553de82825..cba5239ae962b429080b60e1aacd56af822d81a2 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -25,7 +25,6 @@ include_recipe "passenger"
 include_recipe "geoipupdate"
 include_recipe "git"
 include_recipe "memcached"
 include_recipe "geoipupdate"
 include_recipe "git"
 include_recipe "memcached"

-include_recipe "munin"

 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "php::fpm"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "php::fpm"


@@ -67,6 +66,7 @@ package %w[
   libboost-program-options-dev
   libboost-regex-dev
   libboost-system-dev
   libboost-program-options-dev
   libboost-regex-dev
   libboost-system-dev

+  libbrotli-dev

   libbytes-random-secure-perl
   libcairo2-dev
   libcrypto++-dev
   libbytes-random-secure-perl
   libcairo2-dev
   libcrypto++-dev


@@ -318,16 +318,17 @@ if node[:postgresql][:clusters][:"15/main"]
     type "forking"
     environment_file "/etc/default/cgimap-%i"
     user "apis"
     type "forking"
     environment_file "/etc/default/cgimap-%i"
     user "apis"

-    exec_start "/srv/%i.apis.dev.openstreetmap.org/cgimap/openstreetmap-cgimap --daemon --port $CGIMAP_PORT --instances 5"
+    group "www-data"
+    umask "0002"
+    exec_start "/srv/%i.apis.dev.openstreetmap.org/cgimap/build/openstreetmap-cgimap --daemon --instances 5"

     exec_reload "/bin/kill -HUP $MAINPID"
     exec_reload "/bin/kill -HUP $MAINPID"

+    runtime_directory "cgimap-%i"

     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
 
     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
 

-  cgimap_port = 9000
-

   Dir.glob("/srv/*.apis.dev.openstreetmap.org").each do |dir|
     node.default_unless[:dev][:rails][File.basename(dir).split(".").first] = {}
   end
   Dir.glob("/srv/*.apis.dev.openstreetmap.org").each do |dir|
     node.default_unless[:dev][:rails][File.basename(dir).split(".").first] = {}
   end


@@ -386,6 +387,12 @@ if node[:postgresql][:clusters][:"15/main"]
         mode "755"
       end
 
         mode "755"
       end
 

+      openssl_rsa_private_key "#{site_directory}/doorkeeper.key" do
+        owner "root"
+        group "root"
+        mode "0400"
+      end
+

       rails_port site_name do
         directory rails_directory
         user "apis"
       rails_port site_name do
         directory rails_directory
         user "apis"


@@ -402,6 +409,7 @@ if node[:postgresql][:clusters][:"15/main"]
         csp_enforce true
         run_migrations true
         trace_use_job_queue true
         csp_enforce true
         run_migrations true
         trace_use_job_queue true

+        doorkeeper_signing_key lazy { File.read("#{site_directory}/doorkeeper.key") }

       end
 
       template "#{rails_directory}/config/initializers/setup.rb" do
       end
 
       template "#{rails_directory}/config/initializers/setup.rb" do


@@ -438,31 +446,28 @@ if node[:postgresql][:clusters][:"15/main"]
           group "apis"
         end
 
           group "apis"
         end
 

-        execute "#{cgimap_directory}/autogen.sh" do
-          action :nothing
-          command "./autogen.sh"
-          cwd cgimap_directory
+        directory "#{cgimap_directory}/build" do

           user "apis"
           group "apis"
           user "apis"
           group "apis"

-          subscribes :run, "git[#{cgimap_directory}]", :immediately
+          mode "0755"

         end
 
         end
 

-        execute "#{cgimap_directory}/configure" do
+        execute "#{cgimap_directory}/CMakeLists.txt" do

           action :nothing
           action :nothing

-          command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu --enable-yajl"
-          cwd cgimap_directory
+          command "cmake .."
+          cwd "#{cgimap_directory}/build"

           user "apis"
           group "apis"
           user "apis"
           group "apis"

-          subscribes :run, "execute[#{cgimap_directory}/autogen.sh]", :immediately
+          subscribes :run, "git[#{cgimap_directory}]", :immediately

         end
 
         end
 

-        execute "#{cgimap_directory}/Makefile" do
+        execute "#{cgimap_directory}/build/Makefile" do

           action :nothing
           command "make -j"
           action :nothing
           command "make -j"

-          cwd cgimap_directory
+          cwd "#{cgimap_directory}/build"

           user "apis"
           group "apis"
           user "apis"
           group "apis"

-          subscribes :run, "execute[#{cgimap_directory}/configure]", :immediately
+          subscribes :run, "execute[#{cgimap_directory}/CMakeLists.txt]", :immediately

         end
 
         template "/etc/default/cgimap-#{name}" do
         end
 
         template "/etc/default/cgimap-#{name}" do


@@ -470,7 +475,7 @@ if node[:postgresql][:clusters][:"15/main"]
           owner "root"
           group "root"
           mode "640"
           owner "root"
           group "root"
           mode "640"

-          variables :cgimap_port => cgimap_port,
+          variables :cgimap_socket => "/run/cgimap-#{name}/socket",

                     :database_port => node[:postgresql][:clusters][:"15/main"][:port],
                     :database_name => database_name,
                     :log_directory => log_directory,
                     :database_port => node[:postgresql][:clusters][:"15/main"][:port],
                     :database_name => database_name,
                     :log_directory => log_directory,


@@ -479,7 +484,7 @@ if node[:postgresql][:clusters][:"15/main"]
 
         service "cgimap@#{name}" do
           action [:start, :enable]
 
         service "cgimap@#{name}" do
           action [:start, :enable]

-          subscribes :restart, "execute[#{cgimap_directory}/Makefile]"
+          subscribes :restart, "execute[#{cgimap_directory}/build/Makefile]"

           subscribes :restart, "template[/etc/default/cgimap-#{name}]"
           subscribes :restart, "systemd_service[cgimap@]"
         end
           subscribes :restart, "template[/etc/default/cgimap-#{name}]"
           subscribes :restart, "systemd_service[cgimap@]"
         end


@@ -496,7 +501,7 @@ if node[:postgresql][:clusters][:"15/main"]
                   :aliases => site_aliases,
                   :secret_key_base => secret_key_base,
                   :cgimap_enabled => details.key?(:cgimap_repository),
                   :aliases => site_aliases,
                   :secret_key_base => secret_key_base,
                   :cgimap_enabled => details.key?(:cgimap_repository),

-                  :cgimap_port => cgimap_port
+                  :cgimap_socket => "/run/cgimap-#{name}/socket"

       end
 
       template "/etc/logrotate.d/apis-#{name}" do
       end
 
       template "/etc/logrotate.d/apis-#{name}" do


@@ -508,8 +513,6 @@ if node[:postgresql][:clusters][:"15/main"]
                   :log_directory => log_directory,
                   :rails_directory => rails_directory
       end
                   :log_directory => log_directory,
                   :rails_directory => rails_directory
       end

-
-      cgimap_port += 1

     else
       file "/etc/logrotate.d/apis-#{name}" do
         action :delete
     else
       file "/etc/logrotate.d/apis-#{name}" do
         action :delete


@@ -568,13 +571,6 @@ if node[:postgresql][:clusters][:"15/main"]
   apache_site "apis.dev.openstreetmap.org" do
     template "apache.apis.erb"
   end
   apache_site "apis.dev.openstreetmap.org" do
     template "apache.apis.erb"
   end

-
-  node[:postgresql][:clusters].each_key do |name|
-    postgresql_munin name do
-      cluster name
-      database "ALL"
-    end
-  end

 end
 
 directory "/srv/ooc.openstreetmap.org" do
 end
 
 directory "/srv/ooc.openstreetmap.org" do