X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/32a423888e0d6b5254c55e4faf418b31749dc69e..ffdc1400431395dfad46e36c05f79466109d36b6:/cookbooks/web/recipes/backend.rb?ds=sidebyside diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb index afc852c00..97bab57c7 100644 --- a/cookbooks/web/recipes/backend.rb +++ b/cookbooks/web/recipes/backend.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: web +# Cookbook:: web # Recipe:: backend # -# Copyright 2011, OpenStreetMap Foundation +# Copyright:: 2011, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -36,7 +36,24 @@ end apache_site "www.openstreetmap.org" do template "apache.backend.erb" - variables :secret_key_base => web_passwords["secret_key_base"] + variables :status => node[:web][:status], + :secret_key_base => web_passwords["secret_key_base"] end node.normal[:memcached][:ip_address] = node.internal_ipaddress + +service "rails-jobs@storage" do + action [:enable, :start] + supports :restart => true + subscribes :restart, "rails_port[www.openstreetmap.org]" + subscribes :restart, "systemd_service[rails-jobs]" +end + +if node[:web][:primary_cluster] + service "rails-jobs@traces" do + action [:enable, :start] + supports :restart => true + subscribes :restart, "rails_port[www.openstreetmap.org]" + subscribes :restart, "systemd_service[rails-jobs]" + end +end