Drop role for noquiklos

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index a32b1f582f31523ee7bb12322f209098b25c42ba..8a2acef3267634b8c8e2e037fb65a21062269313 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -24,6 +24,7 @@ include_recipe "geoipupdate"
 include_recipe "munin"
 include_recipe "nodejs"
 include_recipe "passenger"
 include_recipe "munin"
 include_recipe "nodejs"
 include_recipe "passenger"

+include_recipe "ruby"

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


@@ -41,18 +42,9 @@ end
 
 nodejs_package "svgo"
 
 
 nodejs_package "svgo"
 

-template "/etc/cron.hourly/passenger" do
-  cookbook "web"
-  source "passenger.cron.erb"
-  owner "root"
-  group "root"
-  mode "755"
-end
-
-ruby_version = node[:passenger][:ruby_version]

 rails_directory = "#{node[:web][:base_directory]}/rails"
 
 rails_directory = "#{node[:web][:base_directory]}/rails"
 

-piwik = data_bag_item("web", "piwik")
+matomo = data_bag_item("web", "matomo")

 
 storage = {
   "avatars" => {
 
 storage = {
   "avatars" => {


@@ -93,14 +85,19 @@ storage = {
   }
 }
 
   }
 }
 

+db_host = if node[:web][:status] == "database_readonly"
+            node[:web][:readonly_database_host]
+          else
+            node[:web][:database_host]
+          end
+

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

-  ruby ruby_version

   directory rails_directory
   user "rails"
   group "rails"
   repository "https://git.openstreetmap.org/public/rails.git"
   revision "live"
   directory rails_directory
   user "rails"
   group "rails"
   repository "https://git.openstreetmap.org/public/rails.git"
   revision "live"

-  database_host node[:web][:database_host]
+  database_host db_host

   database_name "openstreetmap"
   database_username "rails"
   database_password db_passwords["rails"]
   database_name "openstreetmap"
   database_username "rails"
   database_password db_passwords["rails"]


@@ -115,9 +112,12 @@ rails_port "www.openstreetmap.org" do
   id_application web_passwords["id_application"]
   oauth_key web_passwords["oauth_key"]
   oauth_application web_passwords["oauth_application"]
   id_application web_passwords["id_application"]
   oauth_key web_passwords["oauth_key"]
   oauth_application web_passwords["oauth_application"]

-  piwik_configuration "location" => piwik[:location],
-                      "site" => piwik[:site],
-                      "goals" => piwik[:goals].to_hash
+  matomo_configuration "location" => matomo[:location],
+                       "site" => matomo[:site],
+                       "visitor_cookie_timeout" => matomo[:visitor_cookie_timeout],
+                       "referral_cookie_timeout" => matomo[:referral_cookie_timeout],
+                       "session_cookie_timeout" => matomo[:session_cookie_timeout],
+                       "goals" => matomo[: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"


@@ -142,33 +142,21 @@ rails_port "www.openstreetmap.org" do
   avatar_storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com"
   trace_image_storage_url "https://openstreetmap-gps-images.s3.dualstack.eu-west-1.amazonaws.com"
   overpass_url "https://query.openstreetmap.org/query-features"
   avatar_storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com"
   trace_image_storage_url "https://openstreetmap-gps-images.s3.dualstack.eu-west-1.amazonaws.com"
   overpass_url "https://query.openstreetmap.org/query-features"

+  overpass_credentials true

 end
 
 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"
 systemd_service "rails-jobs@" do
   description "Rails job queue runner"
   type "simple"

-  environment "RAILS_ENV" => "production", "QUEUE" => "%I"
+  environment "RAILS_ENV" => "production", "QUEUE" => "%I", "SLEEP_DELAY" => "60"

   user "rails"
   working_directory rails_directory
   user "rails"
   working_directory rails_directory

-  exec_start "#{bundle} exec rake jobs:work"
+  exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"

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

-  private_tmp true
-  private_devices true
-  protect_system "full"
-  protect_home true
-  no_new_privileges true
+  nice 10
+  sandbox :enable_network => true
+  memory_deny_write_execute false
+  read_write_paths "/var/log/web"

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


@@ -180,8 +168,13 @@ template "/usr/local/bin/cleanup-rails-assets" do
   mode "755"
 end
 
   mode "755"
 end
 

-gem_package "apachelogregex"
-gem_package "file-tail"
+gem_package "apachelogregex" do
+  gem_binary node[:ruby][:gem]
+end
+
+gem_package "file-tail" do
+  gem_binary node[:ruby][:gem]
+end

 
 template "/usr/local/bin/api-statistics" do
   source "api-statistics.erb"
 
 template "/usr/local/bin/api-statistics" do
   source "api-statistics.erb"


@@ -195,12 +188,12 @@ systemd_service "api-statistics" do
   user "rails"
   group "adm"
   exec_start "/usr/local/bin/api-statistics"
   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
+  nice 10
+  sandbox true
+  read_write_paths [
+    "/srv/www.openstreetmap.org/rails/tmp",
+    "/var/lib/prometheus/node-exporter"
+  ]

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


@@ -211,7 +204,9 @@ service "api-statistics" do
   subscribes :restart, "systemd_service[api-statistics]"
 end
 
   subscribes :restart, "systemd_service[api-statistics]"
 end
 

-gem_package "hpricot"
+gem_package "hpricot" do
+  gem_binary node[:ruby][:gem]
+end

 
 munin_plugin "api_calls_status"
 munin_plugin "api_calls_num"
 
 munin_plugin "api_calls_status"
 munin_plugin "api_calls_num"