Bump cookstyle from 7.12.5 to 7.13.0

[chef.git] / cookbooks / web / resources / rails_port.rb

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index f8ee4ca2e1b09d8c5dfcddc21489129b0469de32..e0c9cad9177b028b4dddf27fea4d2f508b460ff9 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -22,6 +22,8 @@ require "yaml"
 resource_name :rails_port
 provides :rails_port
 
 resource_name :rails_port
 provides :rails_port
 

+unified_mode true
+

 default_action :create
 
 property :site, String, :name_property => true
 default_action :create
 
 property :site, String, :name_property => true


@@ -73,6 +75,7 @@ property :diary_feed_delay, Integer
 property :storage_configuration, Hash, :default => {}
 property :storage_service, String, :default => "local"
 property :storage_url, String
 property :storage_configuration, Hash, :default => {}
 property :storage_service, String, :default => "local"
 property :storage_url, String

+property :tile_cdn_url, String

 
 action :create do
   package %W[
 
 action :create do
   package %W[


@@ -85,6 +88,7 @@ action :create do
 
   package %w[
     g++
 
   package %w[
     g++

+    make

     pkg-config
     libpq-dev
     libsasl2-dev
     pkg-config
     libpq-dev
     libsasl2-dev


@@ -318,8 +322,9 @@ action :create do
     "trace_use_job_queue",
     "diary_feed_delay",
     "storage_service",
     "trace_use_job_queue",
     "diary_feed_delay",
     "storage_service",

-    "storage_url"
-  ).reject { |_k, v| v.nil? }.merge(
+    "storage_url",
+    "tile_cdn_url"
+  ).compact.merge(

     "server_protocol" => "https",
     "server_url" => new_resource.site,
     "support_email" => "support@openstreetmap.org",
     "server_protocol" => "https",
     "server_url" => new_resource.site,
     "support_email" => "support@openstreetmap.org",


@@ -445,6 +450,7 @@ action :create do
   file "#{rails_directory}/public/export/embed.html" do
     action :nothing
     subscribes :delete, "git[#{rails_directory}]"
   file "#{rails_directory}/public/export/embed.html" do
     action :nothing
     subscribes :delete, "git[#{rails_directory}]"

+    subscribes :delete, "file[#{rails_directory}/config/settings.local.yml]"

   end
 
   passenger_application rails_directory do
   end
 
   passenger_application rails_directory do