X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..9b52f786e3cc0481c6655c2b60ab998a8b55cd6d:/cookbooks/web/recipes/frontend.rb?ds=inline diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb index f0508f8e8..71a7c4384 100644 --- a/cookbooks/web/recipes/frontend.rb +++ b/cookbooks/web/recipes/frontend.rb @@ -8,7 +8,7 @@ # 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,13 +17,12 @@ # limitations under the License. # -include_recipe "apache::ssl" +include_recipe "apache" include_recipe "web::rails" web_passwords = data_bag_item("web", "passwords") apache_module "alias" -apache_module "deflate" apache_module "expires" apache_module "headers" apache_module "proxy_http" @@ -31,6 +30,7 @@ apache_module "proxy_balancer" apache_module "lbmethod_byrequests" apache_module "lbmethod_bybusyness" apache_module "rewrite" +apache_module "unique_id" apache_site "default" do action [:disable] @@ -38,28 +38,20 @@ 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 -end - -munin_plugin "api_calls_num" do - action :delete -end - -munin_plugin "api_calls_#{node[:hostname]}" do - target "api_calls_" + mode 0o644 end -munin_plugin "api_waits_#{node[:hostname]}" do - target "api_waits_" +service "rails-jobs" do + action [:enable, :start] + supports :restart => true + subscribes :restart, "rails_port[www.openstreetmap.org]" + subscribes :restart, "systemd_service[rails-jobs]" end