Merge remote-tracking branch 'github/pull/603'

[chef.git] / cookbooks / web / recipes / frontend.rb

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index ecfaea7efb55de325f3e986e1d275b225b1576d4..63dabd9c0fbe34bd7c2cac3c857d9fcdb8e569cb 100644 (file)
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -33,6 +33,7 @@ apache_module "proxy"
 apache_module "proxy_fcgi"
 apache_module "lbmethod_byrequests"
 apache_module "lbmethod_bybusyness"
 apache_module "proxy_fcgi"
 apache_module "lbmethod_byrequests"
 apache_module "lbmethod_bybusyness"

+apache_module "reqtimeout"

 apache_module "rewrite"
 apache_module "unique_id"
 
 apache_module "rewrite"
 apache_module "unique_id"
 


@@ -63,29 +64,37 @@ template "/etc/logrotate.d/apache2" do
   mode "644"
 end
 
   mode "644"
 end
 

-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
+if %w[database_offline database_readonly].include?(node[:web][:status])
+  service "rails-jobs@mailers" do
+    action :stop
+  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
+  service "rails-jobs@storage" do
+    action :stop
+  end

 
 

-if node[:web][:primary_cluster]

   service "rails-jobs@traces" do
   service "rails-jobs@traces" do

+    action :stop
+  end
+else
+  service "rails-jobs@mailers" do

     action [:enable, :start]
     supports :restart => true
     subscribes :restart, "rails_port[www.openstreetmap.org]"
     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
   end

-else
+
+  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
+

   service "rails-jobs@traces" do
   service "rails-jobs@traces" do

-    action [:disable, :stop]
+    action [:enable, :start]
+    supports :restart => true
+    subscribes :restart, "rails_port[www.openstreetmap.org]"
+    subscribes :restart, "systemd_service[rails-jobs@]"

   end
 end
   end
 end