civicrm version bump

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 90efbb421839fa8ffd30d605c5824396e5f7e4ce..caf20279f1dc8727a3847ccdfe0e245e6dd8ad1d 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: web
+# Cookbook:: web

 # Recipe:: rails
 #
 # Recipe:: rails
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,17 +17,28 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "tools"
-include_recipe "web::base"
-

 include_recipe "apache"
 include_recipe "apache"

-include_recipe "passenger"
+include_recipe "apt"

 include_recipe "git"
 include_recipe "git"

+include_recipe "geoipupdate"
+include_recipe "munin"

 include_recipe "nodejs"
 include_recipe "nodejs"

+include_recipe "passenger"
+include_recipe "tools"
+include_recipe "web::base"

 
 web_passwords = data_bag_item("web", "passwords")
 db_passwords = data_bag_item("db", "passwords")
 
 
 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
 nodejs_package "svgo"
 
 template "/etc/cron.hourly/passenger" do


@@ -35,21 +46,35 @@ template "/etc/cron.hourly/passenger" do
   source "passenger.cron.erb"
   owner "root"
   group "root"
   source "passenger.cron.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 end
 

+ruby_version = node[:passenger][:ruby_version]

 rails_directory = "#{node[:web][:base_directory]}/rails"
 
 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")
+
+storage = {
+  "aws" => {
+    "service" => "S3",
+    "access_key_id" => "AKIASQUXHPE7AMJQRFOS",
+    "secret_access_key" => web_passwords["aws_key"],
+    "region" => "eu-west-1",
+    "bucket" => "openstreetmap-user-avatars",
+    "use_dualstack_endpoint" => true,
+    "upload" => {
+      "acl" => "public-read",
+      "cache_control" => "public, max-age=31536000, immutable"
+    }
+  }
+}

 
 rails_port "www.openstreetmap.org" do
 
 rails_port "www.openstreetmap.org" do

-  ruby node[:passenger][:ruby_version]
+  ruby ruby_version

   directory rails_directory
   user "rails"
   group "rails"
   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"
   revision "live"
   database_host node[:web][:database_host]
   database_name "openstreetmap"


@@ -66,7 +91,9 @@ rails_port "www.openstreetmap.org" do
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]
   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"
   google_auth_id "651529786092-6c5ahcu0tpp95emiec8uibg11asmk34t.apps.googleusercontent.com"
   google_auth_secret web_passwords["google_auth_secret"]
   google_openid_realm "https://www.openstreetmap.org"


@@ -78,9 +105,41 @@ rails_port "www.openstreetmap.org" do
   github_auth_secret web_passwords["github_auth_secret"]
   wikipedia_auth_id "e4fe0c2c5855d23ed7e1f1c0fa1f1c58"
   wikipedia_auth_secret web_passwords["wikipedia_auth_secret"]
   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"]
   thunderforest_key web_passwords["thunderforest_key"]
   totp_key web_passwords["totp_key"]

+  csp_enforce true
+  trace_use_job_queue true
+  diary_feed_delay 12
+  storage_configuration storage
+  storage_service "aws"
+  storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com"
+end
+
+gem_package "bundler#{ruby_version}" do
+  package_name "bundler"
+  gem_binary "gem#{ruby_version}"
+  options "--format-executable"
+end
+
+bundle = if File.exist?("/usr/bin/bundle#{ruby_version}")
+           "/usr/bin/bundle#{ruby_version}"
+         else
+           "/usr/local/bin/bundle#{ruby_version}"
+         end
+
+systemd_service "rails-jobs@" do
+  description "Rails job queue runner"
+  type "simple"
+  environment "RAILS_ENV" => "production", "QUEUE" => "%I"
+  user "rails"
+  working_directory rails_directory
+  exec_start "#{bundle} exec rake jobs:work"
+  restart "on-failure"
+  private_tmp true
+  private_devices true
+  protect_system "full"
+  protect_home true
+  no_new_privileges true

 end
 
 package "libjson-xs-perl"
 end
 
 package "libjson-xs-perl"


@@ -89,7 +148,7 @@ template "/usr/local/bin/cleanup-rails-assets" do
   source "cleanup-assets.erb"
   owner "root"
   group "root"
   source "cleanup-assets.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 gem_package "apachelogregex"
 end
 
 gem_package "apachelogregex"


@@ -99,7 +158,7 @@ template "/usr/local/bin/api-statistics" do
   source "api-statistics.erb"
   owner "root"
   group "root"
   source "api-statistics.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 systemd_service "api-statistics" do
 end
 
 systemd_service "api-statistics" do


@@ -112,6 +171,7 @@ systemd_service "api-statistics" do
   private_network true
   protect_system "full"
   protect_home true
   private_network true
   protect_system "full"
   protect_home true

+  no_new_privileges true

   restart "on-failure"
 end
 
   restart "on-failure"
 end