X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d51401753a69671e8cd68ed3f2b8789016f54396..cf163679e4cf9c867cde63fe724ba3e578660d0a:/cookbooks/web/recipes/frontend.rb?ds=sidebyside diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb index 4fa375fba..e183bfb47 100644 --- a/cookbooks/web/recipes/frontend.rb +++ b/cookbooks/web/recipes/frontend.rb @@ -29,10 +29,11 @@ web_passwords = data_bag_item("web", "passwords") apache_module "alias" 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 "reqtimeout" apache_module "rewrite" apache_module "unique_id" @@ -77,15 +78,9 @@ service "rails-jobs@storage" do 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 -else - service "rails-jobs@traces" do - action [:disable, :stop] - end +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