Switch main web site to letsencrypt

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 7945d3d0394245e960990182696c8a9fe8aa7779..4095be1bc06e2bba9710b26deb582825377b3f32 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -28,6 +28,14 @@ include_recipe "nodejs"
 web_passwords = data_bag_item("web", "passwords")
 db_passwords = data_bag_item("db", "passwords")
 
+ssl_certificate "www.openstreetmap.org" do
+  domains ["www.openstreetmap.org", "www.osm.org",
+           "api.openstreetmap.org", "api.osm.org",
+           "openstreetmap.org", "osm.org"]
+  fallback_certificate "openstreetmap"
+  notifies :reload, "service[apache2]"
+end
+
 nodejs_package "svgo"
 
 template "/etc/cron.hourly/passenger" do
@@ -76,8 +84,11 @@ rails_port "www.openstreetmap.org" do
   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"]
   thunderforest_key web_passwords["thunderforest_key"]
+  totp_key web_passwords["totp_key"]
 end
 
 package "libjson-xs-perl"