Configure authentication for GitHub

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 9fab99c3021913be01e772c9796cec28ecd1be9c..a388b21595f6fa74f66e54f0811306d16899570e 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"
-  mode 0755
+  mode 0o755
 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"
-  memcache_servers %w(rails1 rails2 rails3)
+  memcache_servers node[:web][:memcached_servers]
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]
@@ -76,9 +76,20 @@ 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"]
+  github_auth_id "acf7da34edee99e35499"
+  github_auth_secret web_passwords["github_auth_secret"]
   mapzen_valhalla_key web_passwords["mapzen_valhalla_key"]
 end
 
+package "libjson-xs-perl"
+
+template "/usr/local/bin/cleanup-rails-assets" do
+  source "cleanup-assets.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
 gem_package "apachelogregex"
 gem_package "file-tail"
 
@@ -86,14 +97,14 @@ template "/usr/local/bin/api-statistics" do
   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"
-  mode 0755
+  mode 0o755
 end
 
 service "api-statistics" do
@@ -103,6 +114,8 @@ service "api-statistics" do
   subscribes :restart, "template[/etc/init.d/api-statistics]"
 end
 
+gem_package "hpricot"
+
 munin_plugin "api_calls_status"
 munin_plugin "api_calls_num"