Merge remote-tracking branch 'github/pull/349' into master

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

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index 69fb018d87760ed7df96e6f0a62f1e42ad985af1..871f692d955be5794c3d30a194108e2e24d36bb0 100644 (file)
--- a/cookbooks/web/recipes/backend.rb
+++ b/cookbooks/web/recipes/backend.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: web
+# Cookbook:: web
 # Recipe:: backend
 #
-# 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.
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+node.default[:memcached][:ip_address] = node.internal_ipaddress
+
 include_recipe "memcached"
 include_recipe "apache"
 include_recipe "web::rails"
@@ -40,4 +42,10 @@ apache_site "www.openstreetmap.org" do
             :secret_key_base => web_passwords["secret_key_base"]
 end
 
-node.normal[:memcached][:ip_address] = node.internal_ipaddress
+service "rails-jobs@storage" do
+  action [:disable, :stop]
+end
+
+service "rails-jobs@traces" do
+  action [:disable, :stop]
+end