Only set the memcached IP address on backends

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 04bf040c45f6542df6f1f80645b2e6ba49521ef0..f9a0614989fb88b53b8e145e19ec91d101241cc4 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -1,8 +1,8 @@
 #
 #

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

 # Recipe:: rails
 #
 # Recipe:: rails
 #

-# 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.


@@ -17,13 +17,15 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "tools"
-include_recipe "web::base"
-

 include_recipe "apache"
 include_recipe "apache"

-include_recipe "passenger"
+include_recipe "apt"

 include_recipe "git"
 include_recipe "git"

+include_recipe "geoipupdate"
+include_recipe "munin"

 include_recipe "nodejs"
 include_recipe "nodejs"

+include_recipe "passenger"
+include_recipe "tools"
+include_recipe "web::base"

 
 web_passwords = data_bag_item("web", "passwords")
 db_passwords = data_bag_item("db", "passwords")
 
 web_passwords = data_bag_item("web", "passwords")
 db_passwords = data_bag_item("db", "passwords")


@@ -44,7 +46,7 @@ template "/etc/cron.hourly/passenger" do
   source "passenger.cron.erb"
   owner "root"
   group "root"
   source "passenger.cron.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 ruby_version = node[:passenger][:ruby_version]
 end
 
 ruby_version = node[:passenger][:ruby_version]


@@ -134,7 +136,7 @@ template "/usr/local/bin/cleanup-rails-assets" do
   source "cleanup-assets.erb"
   owner "root"
   group "root"
   source "cleanup-assets.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 gem_package "apachelogregex"
 end
 
 gem_package "apachelogregex"


@@ -144,7 +146,7 @@ template "/usr/local/bin/api-statistics" do
   source "api-statistics.erb"
   owner "root"
   group "root"
   source "api-statistics.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 systemd_service "api-statistics" do
 end
 
 systemd_service "api-statistics" do