X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e0eb12fed2fb98b8930c4e2d60b43d2b9fa3e2b5..c9c9ccd01efe21f650cab8fce05210f60c7a76cc:/cookbooks/web/recipes/frontend.rb

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index b2ba01832..eb95b18f7 100644
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -38,7 +38,8 @@ 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
 
 template "/etc/logrotate.d/apache2" do
@@ -49,6 +50,10 @@ template "/etc/logrotate.d/apache2" do
 end
 
 service "rails-jobs" do
+  action [:stop, :disable]
+end
+
+service "rails-jobs@mailers" do
   action [:enable, :start]
   supports :restart => true
   subscribes :restart, "rails_port[www.openstreetmap.org]"