Add maps subdomain to main site certificate

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 02c0943591cce1091547d6578b8e5963355475c6..0a96ddf6d5aeedbf0356e6890e34029efe31793e 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -28,6 +28,15 @@ 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",
+           "maps.openstreetmap.org", "maps.osm.org",
+           "mapz.openstreetmap.org", "mapz.osm.org",
+           "openstreetmap.org", "osm.org"]
+  notifies :reload, "service[apache2]"
+end
+
 nodejs_package "svgo"
 
 template "/etc/cron.hourly/passenger" do
@@ -41,7 +50,7 @@ end
 rails_directory = "#{node[:web][:base_directory]}/rails"
 
 piwik_configuration = data_bag_item("web", "piwik").to_hash.reject do |k, _|
-  %w(chef_type data_bag id).include?(k)
+  %w[chef_type data_bag id].include?(k)
 end
 
 rails_port "www.openstreetmap.org" do
@@ -58,8 +67,6 @@ 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"
@@ -78,8 +85,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"
@@ -111,6 +121,7 @@ systemd_service "api-statistics" do
   private_network true
   protect_system "full"
   protect_home true
+  no_new_privileges true
   restart "on-failure"
 end