turn on dribble replication

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 4874dc66a08749bfd45c4f51156b6a8333e4f4e8..9817e5b347ee3dd8c70599c3fbf09b77a890b2e2 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -20,29 +20,34 @@
 require "yaml"
 require "securerandom"
 
 require "yaml"
 require "securerandom"
 

+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "passenger"
 include_recipe "geoipupdate"
 include_recipe "git"
 include_recipe "memcached"
 include_recipe "apache"
 include_recipe "passenger"
 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"

+include_recipe "podman"

 include_recipe "postgresql"
 include_recipe "python"
 include_recipe "ruby"
 
 package %w[
   ant
 include_recipe "postgresql"
 include_recipe "python"
 include_recipe "ruby"
 
 package %w[
   ant

+  apache2-dev

   aria2
   at
   autoconf
   automake
   awscli
   aria2
   at
   autoconf
   automake
   awscli

+  cmake

   composer
   composer

+  curl

   default-jdk-headless
   default-jre-headless
   default-jdk-headless
   default-jre-headless

+  eatmydata

   fonts-dejavu
   fonts-dejavu-core
   fonts-dejavu-extra
   fonts-dejavu
   fonts-dejavu-core
   fonts-dejavu-extra


@@ -52,6 +57,7 @@ package %w[
   g++
   gcc
   gdal-bin
   g++
   gcc
   gdal-bin

+  gfortran

   gnuplot-nox
   golang
   graphviz
   gnuplot-nox
   golang
   graphviz


@@ -65,13 +71,21 @@ 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
   libcrypto++-dev

+  libcurl4-openssl-dev

   libfcgi-dev
   libfmt-dev
   libfcgi-dev
   libfmt-dev

+  libglib2.0-dev
+  libiniparser-dev

   libjson-xs-perl
   libjson-xs-perl

+  libmapnik-dev

   libmemcached-dev
   libpqxx-dev
   libtool
   libmemcached-dev
   libpqxx-dev
   libtool

+  libxml-twig-perl

   libxml2-dev
   libyajl-dev
   lua-any
   libxml2-dev
   libyajl-dev
   lua-any


@@ -82,8 +96,10 @@ package %w[
   mailutils
   make
   nano
   mailutils
   make
   nano

-  netcat
+  ncftp
+  netcat-openbsd

   osm2pgsql
   osm2pgsql

+  osmium-tool

   osmosis
   pandoc
   pandoc
   osmosis
   pandoc
   pandoc


@@ -108,6 +124,7 @@ package %w[
   pngcrush
   pngquant
   proj-bin
   pngcrush
   pngquant
   proj-bin

+  pyosmium

   python-is-python3
   python3
   python3-brotli
   python-is-python3
   python3
   python3-brotli


@@ -117,6 +134,7 @@ package %w[
   python3-dev
   python3-dotenv
   python3-gdal
   python3-dev
   python3-dotenv
   python3-gdal

+  python3-geojson

   python3-lxml
   python3-lz4
   python3-magic
   python3-lxml
   python3-lz4
   python3-magic


@@ -142,10 +160,6 @@ end
 
 nodejs_package "svgo"
 
 
 nodejs_package "svgo"
 

-python_package "geojson" do
-  python_version "3"
-end
-

 apache_module "env"
 apache_module "expires"
 apache_module "headers"
 apache_module "env"
 apache_module "expires"
 apache_module "headers"


@@ -289,7 +303,7 @@ if node[:postgresql][:clusters][:"15/main"]
   systemd_service "rails-jobs@" do
     description "Rails job queue runner"
     type "simple"
   systemd_service "rails-jobs@" do
     description "Rails job queue runner"
     type "simple"

-    environment "RAILS_ENV" => "production", "SLEEP_DELAY" => "60"
+    environment_file "/etc/default/rails-%i"

     user "apis"
     working_directory "/srv/%i.apis.dev.openstreetmap.org/rails"
     exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"
     user "apis"
     working_directory "/srv/%i.apis.dev.openstreetmap.org/rails"
     exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"


@@ -298,7 +312,10 @@ if node[:postgresql][:clusters][:"15/main"]
     sandbox :enable_network => true
     restrict_address_families "AF_UNIX"
     memory_deny_write_execute false
     sandbox :enable_network => true
     restrict_address_families "AF_UNIX"
     memory_deny_write_execute false

-    read_write_paths "/srv/%i.apis.dev.openstreetmap.org/logs"
+    read_write_paths [
+      "/srv/%i.apis.dev.openstreetmap.org/logs",
+      "/srv/%i.apis.dev.openstreetmap.org/rails/storage"
+    ]

   end
 
   systemd_service "cgimap@" do
   end
 
   systemd_service "cgimap@" do


@@ -306,16 +323,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


@@ -374,6 +392,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"


@@ -390,6 +414,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


@@ -401,6 +426,14 @@ if node[:postgresql][:clusters][:"15/main"]
         notifies :restart, "rails_port[#{site_name}]"
       end
 
         notifies :restart, "rails_port[#{site_name}]"
       end
 

+      template "/etc/default/rails-#{name}" do
+        source "rails.environment.erb"
+        owner "root"
+        group "root"
+        mode "0600"
+        variables :secret_key_base => secret_key_base
+      end
+

       service "rails-jobs@#{name}" do
         action [:enable, :start]
         supports :restart => true
       service "rails-jobs@#{name}" do
         action [:enable, :start]
         supports :restart => true


@@ -418,31 +451,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


@@ -450,15 +480,16 @@ 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,
                     :database_port => node[:postgresql][:clusters][:"15/main"][:port],
                     :database_name => database_name,

-                    :log_directory => log_directory
+                    :log_directory => log_directory,
+                    :options => details[:cgimap_options]

         end
 
         service "cgimap@#{name}" do
           action [:start, :enable]
         end
 
         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


@@ -475,7 +506,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


@@ -487,8 +518,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


@@ -547,13 +576,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


@@ -583,3 +605,16 @@ end
 apache_site "ooc.openstreetmap.org" do
   template "apache.ooc.erb"
 end
 apache_site "ooc.openstreetmap.org" do
   template "apache.ooc.erb"
 end

+
+directory "/etc/systemd/system/user-.slice.d" do
+  owner "root"
+  group "root"
+  mode "0755"
+end
+
+template "/etc/systemd/system/user-.slice.d/99-chef.conf" do
+  source "user-slice.conf.erb"
+  owner "root"
+  group "root"
+  mode "0644"
+end