X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/db9651c7d0eceda2f608ca82571c6cdc4cf17ebe..3b563e12600d3519011cde414ee0465698a7814f:/cookbooks/web/recipes/frontend.rb?ds=sidebyside

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index 1c71a2fd0..ecfaea7ef 100644
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -17,16 +17,20 @@
 # limitations under the License.
 #
 
+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 "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"
@@ -36,8 +40,6 @@ apache_site "default" do
   action [:disable]
 end
 
-# Static legacy files used by external websites
-# eg: OpenLayers
 remote_directory "#{node[:web][:base_directory]}/static" do
   source "static"
   owner "root"
@@ -45,7 +47,7 @@ remote_directory "#{node[:web][:base_directory]}/static" do
   mode "755"
   files_owner "root"
   files_group "root"
-  files_mode 0o644
+  files_mode "644"
 end
 
 apache_site "www.openstreetmap.org" do
@@ -67,3 +69,23 @@ service "rails-jobs@mailers" do
   subscribes :restart, "rails_port[www.openstreetmap.org]"
   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]"
+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
+end