X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ddf19592a9757581d8adc7cfe505e570bf9f0632..9b52f786e3cc0481c6655c2b60ab998a8b55cd6d:/cookbooks/dev/recipes/default.rb?ds=inline

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 8da923fe8..613305d21 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -37,19 +37,12 @@ package %w[
   php-db
   php-fpm
   php-imagick
-  php-mcrypt
   php-mysql
   php-pear
   php-pgsql
   php-sqlite3
-]
-
-package %w[
   pngcrush
   pngquant
-]
-
-package %w[
   python
   python-argparse
   python-beautifulsoup
@@ -58,6 +51,25 @@ package %w[
   python-magic
   python-psycopg2
   python-gdal
+  g++
+  gcc
+  make
+  autoconf
+  automake
+  libtool
+  libfcgi-dev
+  libxml2-dev
+  libmemcached-dev
+  libboost-regex-dev
+  libboost-system-dev
+  libboost-program-options-dev
+  libboost-date-time-dev
+  libboost-filesystem-dev
+  libboost-locale-dev
+  libpqxx-dev
+  libcrypto++-dev
+  libyajl-dev
+  zlib1g-dev
 ]
 
 nodejs_package "svgo"
@@ -76,27 +88,21 @@ apache_module "wsgi"
 
 package "apache2-suexec-pristine"
 
-gem_package "sqlite3"
-
-gem_package "rails" do
-  version "3.0.9"
-end
-
-service "php7.0-fpm" do
+service "php7.2-fpm" do
   action [:enable, :start]
 end
 
-template "/etc/php/7.0/fpm/pool.d/default.conf" do
+template "/etc/php/7.2/fpm/pool.d/default.conf" do
   source "fpm-default.conf.erb"
   owner "root"
   group "root"
   mode 0o644
-  notifies :reload, "service[php7.0-fpm]"
+  notifies :reload, "service[php7.2-fpm]"
 end
 
-file "/etc/php/7.0/fpm/pool.d/www.conf" do
+file "/etc/php/7.2/fpm/pool.d/www.conf" do
   action :delete
-  notifies :reload, "service[php7.0-fpm]"
+  notifies :reload, "service[php7.2-fpm]"
 end
 
 directory "/srv/dev.openstreetmap.org" do
@@ -155,13 +161,13 @@ search(:accounts, "*:*").each do |account|
 
   port = 7000 + account["uid"].to_i
 
-  template "/etc/php/7.0/fpm/pool.d/#{name}.conf" do
+  template "/etc/php/7.2/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
     owner "root"
     group "root"
     mode 0o644
     variables :user => name, :port => port
-    notifies :reload, "service[php7.0-fpm]"
+    notifies :reload, "service[php7.2-fpm]"
   end
 
   ssl_certificate "#{name}.dev.openstreetmap.org" do
@@ -197,10 +203,46 @@ if node[:postgresql][:clusters][:"9.5/main"]
     mode 0o755
   end
 
+  ruby_version = node[:passenger][:ruby_version]
+
+  systemd_service "rails-jobs@" do
+    description "Rails job queue runner"
+    type "simple"
+    user "apis"
+    working_directory "/srv/%i.apis.dev.openstreetmap.org/rails"
+    exec_start "/usr/local/bin/bundle#{ruby_version} exec rake jobs:work"
+    restart "on-failure"
+    private_tmp true
+    private_devices true
+    protect_system "full"
+    protect_home true
+    no_new_privileges true
+  end
+
+  systemd_service "cgimap@" do
+    description "OpenStreetMap API Server"
+    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"
+    exec_reload "/bin/kill -HUP $MAINPID"
+    private_tmp true
+    private_devices true
+    protect_system "full"
+    protect_home true
+    no_new_privileges true
+    restart "on-failure"
+  end
+
+  cgimap_port = 9000
+
   node[:dev][:rails].each do |name, details|
     database_name = details[:database] || "apis_#{name}"
     site_name = "#{name}.apis.dev.openstreetmap.org"
-    rails_directory = "/srv/#{name}.apis.dev.openstreetmap.org"
+    site_directory = "/srv/#{name}.apis.dev.openstreetmap.org"
+    log_directory = "#{site_directory}/logs"
+    rails_directory = "#{site_directory}/rails"
+    cgimap_directory = "#{site_directory}/cgimap"
 
     if details[:repository]
       site_aliases = details[:aliases] || []
@@ -219,8 +261,20 @@ if node[:postgresql][:clusters][:"9.5/main"]
         extension "btree_gist"
       end
 
+      directory site_directory do
+        owner "apis"
+        group "apis"
+        mode 0o755
+      end
+
+      directory log_directory do
+        owner "apis"
+        group "apis"
+        mode 0o755
+      end
+
       rails_port site_name do
-        ruby node[:passenger][:ruby_version]
+        ruby ruby_version
         directory rails_directory
         user "apis"
         group "apis"
@@ -229,6 +283,7 @@ if node[:postgresql][:clusters][:"9.5/main"]
         database_port node[:postgresql][:clusters][:"9.5/main"][:port]
         database_name database_name
         database_username "apis"
+        log_path "#{log_directory}/rails.log"
         memcache_servers ["127.0.0.1"]
         csp_enforce true
         run_migrations true
@@ -243,6 +298,68 @@ if node[:postgresql][:clusters][:"9.5/main"]
         notifies :restart, "rails_port[#{site_name}]"
       end
 
+      service "rails-jobs@#{name}" do
+        action [:enable, :start]
+        supports :restart => true
+        subscribes :restart, "rails_port[#{site_name}]"
+        subscribes :restart, "systemd_service[#{name}]"
+        only_if "fgrep -q delayed_job #{rails_directory}/Gemfile.lock"
+      end
+
+      if details[:cgimap_repository]
+        git cgimap_directory do
+          action :sync
+          repository details[:cgimap_repository]
+          revision details[:cgimap_revision]
+          user "apis"
+          group "apis"
+        end
+
+        execute "#{cgimap_directory}/autogen.sh" do
+          action :nothing
+          command "./autogen.sh"
+          cwd cgimap_directory
+          user "apis"
+          group "apis"
+          subscribes :run, "git[#{cgimap_directory}]", :immediate
+        end
+
+        execute "#{cgimap_directory}/configure" do
+          action :nothing
+          command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu --enable-yajl"
+          cwd cgimap_directory
+          user "apis"
+          group "apis"
+          subscribes :run, "execute[#{cgimap_directory}/autogen.sh]", :immediate
+        end
+
+        execute "#{cgimap_directory}/Makefile" do
+          action :nothing
+          command "make -j"
+          cwd cgimap_directory
+          user "apis"
+          group "apis"
+          subscribes :run, "execute[#{cgimap_directory}/configure]", :immediate
+          notifies :restart, "service[cgimap@#{name}]"
+        end
+
+        template "/etc/default/cgimap-#{name}" do
+          source "cgimap.environment.erb"
+          owner "root"
+          group "root"
+          mode 0o640
+          variables :cgimap_port => cgimap_port,
+                    :database_port => node[:postgresql][:clusters][:"9.5/main"][:port],
+                    :database_name => database_name,
+                    :log_directory => log_directory
+          notifies :restart, "service[cgimap@#{name}]"
+        end
+
+        service "cgimap@#{name}" do
+          action [:start, :enable]
+        end
+      end
+
       ssl_certificate site_name do
         domains [site_name] + site_aliases
         notifies :reload, "service[apache2]"
@@ -250,14 +367,42 @@ if node[:postgresql][:clusters][:"9.5/main"]
 
       apache_site site_name do
         template "apache.rails.erb"
-        variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base
+        variables :application_name => name,
+                  :aliases => site_aliases,
+                  :secret_key_base => secret_key_base,
+                  :cgimap_enabled => details.key?(:cgimap_repository),
+                  :cgimap_port => cgimap_port
+      end
+
+      template "/etc/logrotate.d/apis-#{name}" do
+        source "logrotate.apis.erb"
+        owner "root"
+        group "root"
+        mode 0o644
+        variables :name => name,
+                  :log_directory => log_directory,
+                  :rails_directory => rails_directory
       end
+
+      cgimap_port += 1
     else
+      file "/etc/logrotate.d/apis-#{name}" do
+        action :delete
+      end
+
       apache_site site_name do
         action [:delete]
       end
 
-      directory rails_directory do
+      service "cgimap@#{name}" do
+        action [:stop, :disable]
+      end
+
+      file "/etc/default/cgimap-#{name}" do
+        action :delete
+      end
+
+      directory site_directory do
         action :delete
         recursive true
       end