Install ruby-webrick for prometheus exporters that need it

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 9f51581b4f7bfae1e8a6ea99268aa45c0490a52c..59e9abfb8f0479218fd90fcc9d53471a3d05caf4 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -93,6 +93,12 @@ 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
   ruby ruby_version
   directory rails_directory
 rails_port "www.openstreetmap.org" do
   ruby ruby_version
   directory rails_directory


@@ -100,20 +106,19 @@ rails_port "www.openstreetmap.org" do
   group "rails"
   repository "https://git.openstreetmap.org/public/rails.git"
   revision "live"
   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"]
   email_from "OpenStreetMap <web@noreply.openstreetmap.org>"
   status node[:web][:status]
   messages_domain "messages.openstreetmap.org"
   database_name "openstreetmap"
   database_username "rails"
   database_password db_passwords["rails"]
   email_from "OpenStreetMap <web@noreply.openstreetmap.org>"
   status node[:web][:status]
   messages_domain "messages.openstreetmap.org"

-  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 node[:web][:memcached_servers]
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   log_path "#{node[:web][:log_directory]}/rails.log"
   logstash_path "#{node[:web][:log_directory]}/rails-logstash.log"
   memcache_servers node[:web][:memcached_servers]
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]

+  id_application web_passwords["id_application"]

   oauth_key web_passwords["oauth_key"]
   oauth_application web_passwords["oauth_application"]
   piwik_configuration "location" => piwik[:location],
   oauth_key web_passwords["oauth_key"]
   oauth_application web_passwords["oauth_application"]
   piwik_configuration "location" => piwik[:location],


@@ -136,17 +141,12 @@ rails_port "www.openstreetmap.org" do
   trace_use_job_queue true
   diary_feed_delay 12
   storage_configuration storage
   trace_use_job_queue true
   diary_feed_delay 12
   storage_configuration storage

-  storage_service "avatars"
-  storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com"

   avatar_storage "avatars"
   trace_file_storage "gps_traces"
   trace_image_storage "gps_images"
   trace_icon_storage "gps_images"
   avatar_storage "avatars"
   trace_file_storage "gps_traces"
   trace_image_storage "gps_images"
   trace_icon_storage "gps_images"

-  storage_urls %w[
-    https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com
-    https://openstreetmap-gps-traces.s3.dualstack.eu-west-1.amazonaws.com
-    https://openstreetmap-gps-images.s3.dualstack.eu-west-1.amazonaws.com
-  ]
+  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"
 end
 
   overpass_url "https://query.openstreetmap.org/query-features"
 end