Enable wikimedia authentication

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 47010c722763f2dcab7b29708046c0356b381a95..d58026ca348238cf91e5121321554d10e35bf48d 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"
@@ -58,13 +58,11 @@ rails_port "www.openstreetmap.org" do
   email_from "OpenStreetMap <web@noreply.openstreetmap.org>"
   status node[:web][:status]
   messages_domain "messages.openstreetmap.org"
-  quova_username "ws360602"
-  quova_password web_passwords["quova"]
   gpx_dir "/store/rails/gpx"
   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,8 +74,12 @@ 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"]
+  wikipedia_auth_id "e4fe0c2c5855d23ed7e1f1c0fa1f1c58"
+  wikipedia_auth_secret web_passwords["wikipedia_auth_secret"]
   mapzen_valhalla_key web_passwords["mapzen_valhalla_key"]
-  osrm_url "//api-osrm-routed-production.tilestream.net/viaroute"
+  thunderforest_key web_passwords["thunderforest_key"]
 end
 
 package "libjson-xs-perl"
@@ -86,7 +88,7 @@ template "/usr/local/bin/cleanup-rails-assets" do
   source "cleanup-assets.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 gem_package "apachelogregex"
@@ -96,23 +98,31 @@ 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
+systemd_service "api-statistics" do
+  description "OpenStreetMap API Statistics Daemon"
+  user "rails"
+  group "adm"
+  exec_start "/usr/local/bin/api-statistics"
+  private_tmp true
+  private_devices true
+  private_network true
+  protect_system "full"
+  protect_home true
+  restart "on-failure"
 end
 
 service "api-statistics" do
   action [:enable, :start]
   supports :restart => true
   subscribes :restart, "template[/usr/local/bin/api-statistics]"
-  subscribes :restart, "template[/etc/init.d/api-statistics]"
+  subscribes :restart, "systemd_service[api-statistics]"
 end
 
+gem_package "hpricot"
+
 munin_plugin "api_calls_status"
 munin_plugin "api_calls_num"