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 a404011c34223f5b53941747a5fa71f7c2eef22a..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


@@ -303,22 +309,24 @@ 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"
+    "csp_report_url",
+    "trace_use_job_queue",
+    "diary_feed_delay",
+    "storage_service",
+    "storage_url"

   ).reject { |_k, v| v.nil? }.merge(
     "server_protocol" => "https",
     "server_url" => new_resource.site,
   ).reject { |_k, v| v.nil? }.merge(
     "server_protocol" => "https",
     "server_url" => new_resource.site,

-    "publisher_url" => "https://plus.google.com/111953119785824514010",

     "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
   )
 
   if new_resource.memcache_servers


@@ -339,6 +347,21 @@ action :create do
     only_if { ::File.exist?("#{rails_directory}/config/settings.yml") }
   end
 
     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
     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