X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8d7f3bd070a2ffe8a86e79299be37da9c687dee5..316225f5a6da64609cef4d090047b92bffef49a6:/cookbooks/web/recipes/rails.rb?ds=sidebyside diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index 7945d3d03..0a96ddf6d 100644 --- 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 @@ -76,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" @@ -109,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