X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4bfd3b66e6fc725fb406068a955bb3aeea394f90..83ae724313a707e470a7ea6328cf0c4225cc2121:/cookbooks/web/recipes/rails.rb

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 47010c722..ea9a58c4e 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -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
@@ -35,21 +44,19 @@ 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"
 
-piwik_configuration = data_bag_item("web", "piwik").to_hash.reject do |k, _|
-  %w(chef_type data_bag id).include?(k)
-end
+piwik = data_bag_item("web", "piwik")
 
 rails_port "www.openstreetmap.org" do
   ruby node[:passenger][:ruby_version]
   directory rails_directory
   user "rails"
   group "rails"
-  repository "git://git.openstreetmap.org/rails.git"
+  repository "https://git.openstreetmap.org/public/rails.git"
   revision "live"
   database_host node[:web][:database_host]
   database_name "openstreetmap"
@@ -58,17 +65,17 @@ 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"]
-  piwik_configuration piwik_configuration
+  piwik_configuration "location" => piwik[:location],
+                      "site" => piwik[:site],
+                      "goals" => piwik[:goals].to_hash
   google_auth_id "651529786092-6c5ahcu0tpp95emiec8uibg11asmk34t.apps.googleusercontent.com"
   google_auth_secret web_passwords["google_auth_secret"]
   google_openid_realm "https://www.openstreetmap.org"
@@ -76,8 +83,14 @@ 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"]
+  totp_key web_passwords["totp_key"]
+  csp_enforce true
 end
 
 package "libjson-xs-perl"
@@ -86,7 +99,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 +109,32 @@ 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
+  no_new_privileges 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"