X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/860431223d5e1ada6bc6549c2cfa30dea4d23182..2853b414b3706db2890068f45a91b170058168cd:/cookbooks/web/recipes/frontend.rb

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index 8104304d9..8956b78bb 100644
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-node.default[:memcached][:ip_address] = node.internal_ipaddress
+node.default[:memcached][:ip_address] = node.internal_ipaddress || "127.0.0.1"
 
 include_recipe "memcached"
 include_recipe "apache"
@@ -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"
 
@@ -67,25 +68,19 @@ service "rails-jobs@mailers" do
   action [:enable, :start]
   supports :restart => true
   subscribes :restart, "rails_port[www.openstreetmap.org]"
-  subscribes :restart, "systemd_service[rails-jobs]"
+  subscribes :restart, "systemd_service[rails-jobs@]"
 end
 
 service "rails-jobs@storage" do
   action [:enable, :start]
   supports :restart => true
   subscribes :restart, "rails_port[www.openstreetmap.org]"
-  subscribes :restart, "systemd_service[rails-jobs]"
+  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