X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1c848471a16f9d1ee1fc8a327af110447ea1ef4c..141871be7be50fe092cef6c84cfc84f2393c3545:/cookbooks/web/recipes/backend.rb diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb index fa13948d8..50e84c9df 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, @@ -17,19 +17,43 @@ # limitations under the License. # +node.default[:memcached][:ip_address] = node.internal_ipaddress + include_recipe "memcached" +include_recipe "apache" include_recipe "web::rails" include_recipe "web::cgimap" -apache_module "fastcgi-handler" +web_passwords = data_bag_item("web", "passwords") + apache_module "remoteip" +apache_module "rewrite" +apache_module "proxy" +apache_module "proxy_fcgi" +apache_module "setenvif" apache_site "default" do - action [ :disable ] + action [:disable] end apache_site "www.openstreetmap.org" do template "apache.backend.erb" + variables :status => node[:web][:status], + :secret_key_base => web_passwords["secret_key_base"] end -node.set[: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