Add support for configuring rails using settings.local.yml

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index 0bc88cea7e856232ddc78068eb3c48983d6f8c27..69fb018d87760ed7df96e6f0a62f1e42ad985af1 100644 (file)
--- a/cookbooks/web/recipes/backend.rb
+++ b/cookbooks/web/recipes/backend.rb
@@ -36,7 +36,8 @@ end
 
 apache_site "www.openstreetmap.org" do
   template "apache.backend.erb"
 
 apache_site "www.openstreetmap.org" do
   template "apache.backend.erb"

-  variables :secret_key_base => web_passwords["secret_key_base"]
+  variables :status => node[:web][:status],
+            :secret_key_base => web_passwords["secret_key_base"]

 end
 
 node.normal[:memcached][:ip_address] = node.internal_ipaddress
 end
 
 node.normal[:memcached][:ip_address] = node.internal_ipaddress

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index b2ba018320bd972619a3b3fccefa712387dcb3ab..71a7c4384ac6e408b905f4db93c0558eeaad11f6 100644 (file)
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -38,7 +38,8 @@ end
 
 apache_site "www.openstreetmap.org" do
   template "apache.frontend.erb"
 
 apache_site "www.openstreetmap.org" do
   template "apache.frontend.erb"

-  variables :secret_key_base => web_passwords["secret_key_base"]
+  variables :status => node[:web][:status],
+            :secret_key_base => web_passwords["secret_key_base"]

 end
 
 template "/etc/logrotate.d/apache2" do
 end
 
 template "/etc/logrotate.d/apache2" do

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 412d02dae2953ca64e5597e0b9ba1c239a6dd081..e3276da2c5b3c6e8bbfb933aacd535a65ded09b4 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -61,8 +61,6 @@ property :github_auth_id, String
 property :github_auth_secret, String
 property :wikipedia_auth_id, String
 property :wikipedia_auth_secret, String
 property :github_auth_secret, String
 property :wikipedia_auth_id, String
 property :wikipedia_auth_secret, String

-property :mapquest_key, String
-property :mapzen_valhalla_key, String

 property :thunderforest_key, String
 property :totp_key, String
 property :csp_enforce, [TrueClass, FalseClass], :default => false
 property :thunderforest_key, String
 property :totp_key, String
 property :csp_enforce, [TrueClass, FalseClass], :default => false


@@ -278,6 +276,7 @@ action :create do
   end
 
   file "#{rails_directory}/config/application.yml" do
   end
 
   file "#{rails_directory}/config/application.yml" do

+    action(lazy { File.exist?("#{rails_directory}/config/example.application.yml") ? :create : :delete })

     owner new_resource.user
     group new_resource.group
     mode 0o664
     owner new_resource.user
     group new_resource.group
     mode 0o664


@@ -285,6 +284,59 @@ action :create do
     notifies :run, "execute[#{rails_directory}/public/assets]"
   end
 
     notifies :run, "execute[#{rails_directory}/public/assets]"
   end
 

+  settings = new_resource.slice(
+    "email_from",
+    "status",
+    "messages_domain",
+    "attachments_dir",
+    "log_path",
+    "logstash_path",
+    "memcache_servers",
+    "potlatch2_key",
+    "id_key",
+    "oauth_key",
+    "nominatim_url",
+    "osrm_url",
+    "google_auth_id",
+    "google_auth_secret",
+    "google_openid_realm",
+    "facebook_auth_id",
+    "facebook_auth_secret",
+    "windowslive_auth_id",
+    "windowslive_auth_secret",
+    "github_auth_id",
+    "gihub_auth_secret",
+    "wikipedia_auth_id",
+    "wikipedia_auth_secret",
+    "thunderforest_key",
+    "totp_key",
+    "csp_enforce",
+    "csp_report_url"
+  ).merge(
+    "server_protocol" => "https",
+    "server" => new_resource.site,
+    "publisher_url" => "https://plus.google.com/111953119785824514010",
+    "support_email" => "support@openstreetmap.org",
+    "email_return_path" => "bounces@openstreetmap.org",
+    "geonames_username" => "openstreetmap",
+    "geoip_database" => "/usr/share/GeoIP/GeoIPv6.dat",
+    "trace_use_job_queue" => false
+  )
+
+  if new_resource.gpx_dir
+    settings["gpx_trace_dir"] = "#{new_resource.gpx_dir}/traces"
+    settings["gpx_image_dir"] = "#{new_resource.gpx_dir}/images"
+  end
+
+  file "#{rails_directory}/config/settings.local.yml" do
+    owner new_resource.user
+    group new_resource.group
+    mode 0o664
+    content YAML.dump(settings)
+    notifies :run, "execute[#{rails_directory}/public/assets]"
+    only_if { File.exist?("#{rails_directory}/config/settings.yml") }
+  end
+

   if new_resource.piwik_configuration
     file "#{rails_directory}/config/piwik.yml" do
       owner new_resource.user
   if new_resource.piwik_configuration
     file "#{rails_directory}/config/piwik.yml" do
       owner new_resource.user

diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb
index 467dd455636164ffc77198b9f0baa2cd8c4e10af..6ce83af6c2668f461b5c499ea3c1b363c8efc611 100644 (file)
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -41,6 +41,7 @@
   PassengerMaxRequests 500
   PassengerPreStart https://www.openstreetmap.org/
   PassengerAppGroupName rails
   PassengerMaxRequests 500
   PassengerPreStart https://www.openstreetmap.org/
   PassengerAppGroupName rails

+  SetEnv OPENSTREETMAP_STATUS <%= @status %>

   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 
   #
   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 
   #

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 51d43a394d00d1088f53af8d8655ef955953ae1b..34ef0497abe22bf4d89d78adc64ae9b9e000254b 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -159,6 +159,7 @@
   PassengerMaxRequestQueueSize 250
   PassengerPreStart https://www.openstreetmap.org/
   PassengerAppGroupName rails
   PassengerMaxRequestQueueSize 250
   PassengerPreStart https://www.openstreetmap.org/
   PassengerAppGroupName rails

+  SetEnv OPENSTREETMAP_STATUS <%= @status %>

   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
   Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/favicons/favicon.ico
   Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers
   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
   Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/favicons/favicon.ico
   Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers