Version bump

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

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index b2ba018320bd972619a3b3fccefa712387dcb3ab..947b7583b1a38b5781e123e778416fcba3dd60c8 100644 (file)
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: web
+# Cookbook:: web

 # Recipe:: frontend
 #
 # Recipe:: frontend
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -38,7 +38,8 @@ end
 
 apache_site "www.openstreetmap.org" do
   template "apache.frontend.erb"
 
 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
 end
 
 template "/etc/logrotate.d/apache2" do


@@ -48,7 +49,7 @@ template "/etc/logrotate.d/apache2" do
   mode 0o644
 end
 
   mode 0o644
 end
 

-service "rails-jobs" do
+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]"