put dulcy in production mode and enable backups

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 2542edea3f84e6fb39bccdeb2170b0259d9a4530..52aa09625c447bcd3377025ea4f3e742d84f3e2b 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -35,7 +35,7 @@ template "/etc/cron.hourly/passenger" do
   source "passenger.cron.erb"
   owner "root"
   group "root"
   source "passenger.cron.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 rails_directory = "#{node[:web][:base_directory]}/rails"
 end
 
 rails_directory = "#{node[:web][:base_directory]}/rails"


@@ -64,7 +64,7 @@ rails_port "www.openstreetmap.org" do
   attachments_dir "/store/rails/attachments"
   log_path "#{node[:web][:log_directory]}/rails.log"
   logstash_path "#{node[:web][:log_directory]}/rails-logstash.log"
   attachments_dir "/store/rails/attachments"
   log_path "#{node[:web][:log_directory]}/rails.log"
   logstash_path "#{node[:web][:log_directory]}/rails-logstash.log"

-  memcache_servers node[:web][:backends]
+  memcache_servers node[:web][:memcached_servers]

   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]


@@ -76,7 +76,10 @@ rails_port "www.openstreetmap.org" do
   facebook_auth_secret web_passwords["facebook_auth_secret"]
   windowslive_auth_id "0000000040153C51"
   windowslive_auth_secret web_passwords["windowslive_auth_secret"]
   facebook_auth_secret web_passwords["facebook_auth_secret"]
   windowslive_auth_id "0000000040153C51"
   windowslive_auth_secret web_passwords["windowslive_auth_secret"]

+  github_auth_id "acf7da34edee99e35499"
+  github_auth_secret web_passwords["github_auth_secret"]

   mapzen_valhalla_key web_passwords["mapzen_valhalla_key"]
   mapzen_valhalla_key web_passwords["mapzen_valhalla_key"]

+  thunderforest_key web_passwords["thunderforest_key"]

 end
 
 package "libjson-xs-perl"
 end
 
 package "libjson-xs-perl"


@@ -85,7 +88,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 0755
+  mode 0o755

 end
 
 gem_package "apachelogregex"
 end
 
 gem_package "apachelogregex"


@@ -95,14 +98,14 @@ template "/usr/local/bin/api-statistics" do
   source "api-statistics.erb"
   owner "root"
   group "root"
   source "api-statistics.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 template "/etc/init.d/api-statistics" do
   source "api-statistics.init.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/init.d/api-statistics" do
   source "api-statistics.init.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 service "api-statistics" do
 end
 
 service "api-statistics" do


@@ -112,6 +115,8 @@ service "api-statistics" do
   subscribes :restart, "template[/etc/init.d/api-statistics]"
 end
 
   subscribes :restart, "template[/etc/init.d/api-statistics]"
 end
 

+gem_package "hpricot"
+

 munin_plugin "api_calls_status"
 munin_plugin "api_calls_num"
 
 munin_plugin "api_calls_status"
 munin_plugin "api_calls_num"