Update formatting of header comments

[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 1aeac0139fbc19a171fe7c5a1ee723b86aba5d1c..0a37afe89f7ec5cc143d6c640da3d107d6505096 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -1,8 +1,8 @@
 #
 #

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

 # Resource:: rails_port
 #
 # Resource:: rails_port
 #

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

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -66,6 +66,11 @@ property :totp_key, String
 property :csp_enforce, [TrueClass, FalseClass], :default => false
 property :csp_report_url, String
 property :piwik_configuration, Hash
 property :csp_enforce, [TrueClass, FalseClass], :default => false
 property :csp_report_url, String
 property :piwik_configuration, Hash

+property :trace_use_job_queue, [TrueClass, FalseClass], :default => false
+property :diary_feed_delay, Integer
+property :storage_configuration, Hash, :default => {}
+property :storage_service, String, :default => "local"
+property :storage_url, String

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


@@ -85,6 +90,9 @@ action :create do
     libxslt1-dev
     libmemcached-dev
     libffi-dev
     libxslt1-dev
     libmemcached-dev
     libffi-dev

+    libgd-dev
+    libarchive-dev
+    libbz2-dev

   ]
 
   package %w[
   ]
 
   package %w[


@@ -157,8 +165,6 @@ action :create do
     line.gsub!(/^( *)server_protocol:.*$/, "\\1server_protocol: \"https\"")
     line.gsub!(/^( *)server_url:.*$/, "\\1server_url: \"#{new_resource.site}\"")
 
     line.gsub!(/^( *)server_protocol:.*$/, "\\1server_protocol: \"https\"")
     line.gsub!(/^( *)server_url:.*$/, "\\1server_url: \"#{new_resource.site}\"")
 

-    line.gsub!(/^( *)#publisher_url:.*$/, "\\1publisher_url: \"https://plus.google.com/111953119785824514010\"")
-

     line.gsub!(/^( *)support_email:.*$/, "\\1support_email: \"support@openstreetmap.org\"")
 
     if new_resource.email_from
     line.gsub!(/^( *)support_email:.*$/, "\\1support_email: \"support@openstreetmap.org\"")
 
     if new_resource.email_from


@@ -244,14 +250,6 @@ action :create do
       line.gsub!(/^( *)#wikipedia_auth_secret:.*$/, "\\1wikipedia_auth_secret: \"#{new_resource.wikipedia_auth_secret}\"")
     end
 
       line.gsub!(/^( *)#wikipedia_auth_secret:.*$/, "\\1wikipedia_auth_secret: \"#{new_resource.wikipedia_auth_secret}\"")
     end
 

-    if new_resource.mapquest_key
-      line.gsub!(/^( *)#mapquest_key:.*$/, "\\1mapquest_key: \"#{new_resource.mapquest_key}\"")
-    end
-
-    if new_resource.mapzen_valhalla_key
-      line.gsub!(/^( *)#mapzen_valhalla_key:.*$/, "\\1mapzen_valhalla_key: \"#{new_resource.mapzen_valhalla_key}\"")
-    end
-

     if new_resource.thunderforest_key
       line.gsub!(/^( *)#thunderforest_key:.*$/, "\\1thunderforest_key: \"#{new_resource.thunderforest_key}\"")
     end
     if new_resource.thunderforest_key
       line.gsub!(/^( *)#thunderforest_key:.*$/, "\\1thunderforest_key: \"#{new_resource.thunderforest_key}\"")
     end


@@ -282,23 +280,22 @@ action :create do
     mode 0o664
     content application_yml
     notifies :run, "execute[#{rails_directory}/public/assets]"
     mode 0o664
     content application_yml
     notifies :run, "execute[#{rails_directory}/public/assets]"

-    only_if { File.exist?("#{rails_directory}/config/example.application.yml") }
+    only_if { ::File.exist?("#{rails_directory}/config/example.application.yml") }

   end
 
   file "delete:#{rails_directory}/config/application.yml" do
     path "#{rails_directory}/config/application.yml"
     action :delete
   end
 
   file "delete:#{rails_directory}/config/application.yml" do
     path "#{rails_directory}/config/application.yml"
     action :delete

-    not_if { File.exist?("#{rails_directory}/config/example.application.yml") }
+    not_if { ::File.exist?("#{rails_directory}/config/example.application.yml") }

   end
 
   end
 

-  settings = new_resource.slice(
+  settings = new_resource.to_hash.transform_keys(&:to_s).slice(

     "email_from",
     "status",
     "messages_domain",
     "attachments_dir",
     "log_path",
     "logstash_path",
     "email_from",
     "status",
     "messages_domain",
     "attachments_dir",
     "log_path",
     "logstash_path",

-    "memcache_servers",

     "potlatch2_key",
     "id_key",
     "oauth_key",
     "potlatch2_key",
     "id_key",
     "oauth_key",


@@ -312,24 +309,30 @@ action :create do
     "windowslive_auth_id",
     "windowslive_auth_secret",
     "github_auth_id",
     "windowslive_auth_id",
     "windowslive_auth_secret",
     "github_auth_id",

-    "gihub_auth_secret",
+    "github_auth_secret",

     "wikipedia_auth_id",
     "wikipedia_auth_secret",
     "thunderforest_key",
     "totp_key",
     "csp_enforce",
     "wikipedia_auth_id",
     "wikipedia_auth_secret",
     "thunderforest_key",
     "totp_key",
     "csp_enforce",

-    "csp_report_url"
-  ).merge(
+    "csp_report_url",
+    "trace_use_job_queue",
+    "diary_feed_delay",
+    "storage_service",
+    "storage_url"
+  ).reject { |_k, v| v.nil? }.merge(

     "server_protocol" => "https",
     "server_protocol" => "https",

-    "server" => new_resource.site,
-    "publisher_url" => "https://plus.google.com/111953119785824514010",
+    "server_url" => new_resource.site,

     "support_email" => "support@openstreetmap.org",
     "email_return_path" => "bounces@openstreetmap.org",
     "geonames_username" => "openstreetmap",
     "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
+    "geoip_database" => "/usr/share/GeoIP/GeoIPv6.dat"

   )
 
   )
 

+  if new_resource.memcache_servers
+    settings["memcache_servers"] = new_resource.memcache_servers.to_a
+  end
+

   if new_resource.gpx_dir
     settings["gpx_trace_dir"] = "#{new_resource.gpx_dir}/traces"
     settings["gpx_image_dir"] = "#{new_resource.gpx_dir}/images"
   if new_resource.gpx_dir
     settings["gpx_trace_dir"] = "#{new_resource.gpx_dir}/traces"
     settings["gpx_image_dir"] = "#{new_resource.gpx_dir}/images"


@@ -341,7 +344,22 @@ action :create do
     mode 0o664
     content YAML.dump(settings)
     notifies :run, "execute[#{rails_directory}/public/assets]"
     mode 0o664
     content YAML.dump(settings)
     notifies :run, "execute[#{rails_directory}/public/assets]"

-    only_if { File.exist?("#{rails_directory}/config/settings.yml") }
+    only_if { ::File.exist?("#{rails_directory}/config/settings.yml") }
+  end
+
+  storage_configuration = new_resource.storage_configuration.merge(
+    "local" => {
+      "service" => "Disk",
+      "root" => "#{rails_directory}/storage"
+    }
+  )
+
+  file "#{rails_directory}/config/storage.yml" do
+    owner new_resource.user
+    group new_resource.group
+    mode 0o664
+    content YAML.dump(storage_configuration)
+    notifies :run, "execute[#{rails_directory}/public/assets]"

   end
 
   if new_resource.piwik_configuration
   end
 
   if new_resource.piwik_configuration