X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..4ed87e86c638523d093bc97b32715c4c6a41a70d:/cookbooks/web/recipes/frontend.rb diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb index f0508f8e8..e18974af8 100644 --- a/cookbooks/web/recipes/frontend.rb +++ b/cookbooks/web/recipes/frontend.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: web +# Cookbook:: web # Recipe:: frontend # -# 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,49 +17,69 @@ # limitations under the License. # -include_recipe "apache::ssl" +node.default[:memcached][:ip_address] = node.internal_ipaddress || "127.0.0.1" + +include_recipe "memcached" +include_recipe "apache" include_recipe "web::rails" +include_recipe "web::cgimap" web_passwords = data_bag_item("web", "passwords") apache_module "alias" -apache_module "deflate" apache_module "expires" apache_module "headers" -apache_module "proxy_http" -apache_module "proxy_balancer" +apache_module "proxy" +apache_module "proxy_fcgi" apache_module "lbmethod_byrequests" apache_module "lbmethod_bybusyness" apache_module "rewrite" +apache_module "unique_id" apache_site "default" do action [:disable] end +remote_directory "#{node[:web][:base_directory]}/static" do + source "static" + owner "root" + group "root" + mode "755" + files_owner "root" + files_group "root" + files_mode "644" +end + apache_site "www.openstreetmap.org" do template "apache.frontend.erb" - variables :secret_key_base => web_passwords["secret_key_base"] + variables :status => node[:web][:status], + :secret_key_base => web_passwords["secret_key_base"] end -gem_package "hpricot" -gem_package "home_run" -gem_package "apachelogregex" - template "/etc/logrotate.d/apache2" do source "logrotate.apache.erb" owner "root" group "root" - mode 0644 + mode "644" end -munin_plugin "api_calls_num" do - action :delete +service "rails-jobs@mailers" do + action [:enable, :start] + supports :restart => true + subscribes :restart, "rails_port[www.openstreetmap.org]" + subscribes :restart, "systemd_service[rails-jobs]" end -munin_plugin "api_calls_#{node[:hostname]}" do - target "api_calls_" +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 -munin_plugin "api_waits_#{node[:hostname]}" do - target "api_waits_" +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