Update bundle

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 4723770439f84aac11073de3e93a0358c71e1bd1..137db62cc0ccdedcb44c518df244d5874ef5e985 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 "munin"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "php::fpm"
@@ -298,7 +297,7 @@ if node[:postgresql][:clusters][:"15/main"]
   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"
@@ -318,16 +317,17 @@ if node[:postgresql][:clusters][:"15/main"]
     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"
+    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
 
-  cgimap_port = 9000
-
   Dir.glob("/srv/*.apis.dev.openstreetmap.org").each do |dir|
     node.default_unless[:dev][:rails][File.basename(dir).split(".").first] = {}
   end
@@ -386,6 +386,12 @@ if node[:postgresql][:clusters][:"15/main"]
         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"
@@ -402,6 +408,7 @@ if node[:postgresql][:clusters][:"15/main"]
         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
@@ -413,6 +420,14 @@ if node[:postgresql][:clusters][:"15/main"]
         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
@@ -430,31 +445,28 @@ if node[:postgresql][:clusters][:"15/main"]
           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"
-          subscribes :run, "git[#{cgimap_directory}]", :immediately
+          mode "0755"
         end
 
-        execute "#{cgimap_directory}/configure" do
+        execute "#{cgimap_directory}/CMakeLists.txt" do
           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"
-          subscribes :run, "execute[#{cgimap_directory}/autogen.sh]", :immediately
+          subscribes :run, "git[#{cgimap_directory}]", :immediately
         end
 
-        execute "#{cgimap_directory}/Makefile" do
+        execute "#{cgimap_directory}/build/Makefile" do
           action :nothing
           command "make -j"
-          cwd cgimap_directory
+          cwd "#{cgimap_directory}/build"
           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
@@ -462,7 +474,7 @@ if node[:postgresql][:clusters][:"15/main"]
           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,
@@ -471,7 +483,7 @@ if node[:postgresql][:clusters][:"15/main"]
 
         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
@@ -488,7 +500,7 @@ if node[:postgresql][:clusters][:"15/main"]
                   :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
@@ -500,8 +512,6 @@ if node[:postgresql][:clusters][:"15/main"]
                   :log_directory => log_directory,
                   :rails_directory => rails_directory
       end
-
-      cgimap_port += 1
     else
       file "/etc/logrotate.d/apis-#{name}" do
         action :delete
@@ -560,13 +570,6 @@ if node[:postgresql][:clusters][:"15/main"]
   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