]> git.openstreetmap.org Git - chef.git/blobdiff - cookbooks/web/resources/rails_port.rb
Require libarchive-dev and libbz2-dev for GPX import
[chef.git] / cookbooks / web / resources / rails_port.rb
index e3276da2c5b3c6e8bbfb933aacd535a65ded09b4..fe55ec34e90ae8377115b6ebb3d3a33265772034 100644 (file)
@@ -66,6 +66,7 @@ property :totp_key, String
 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
 
 action :create do
   package %W[
@@ -85,6 +86,9 @@ action :create do
     libxslt1-dev
     libmemcached-dev
     libffi-dev
+    libgd-dev
+    libarchive-dev
+    libbz2-dev
   ]
 
   package %w[
@@ -244,14 +248,6 @@ action :create do
       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
@@ -275,23 +271,29 @@ action :create do
     line
   end
 
-  file "#{rails_directory}/config/application.yml" do
-    action(lazy { File.exist?("#{rails_directory}/config/example.application.yml") ? :create : :delete })
+  file "create:#{rails_directory}/config/application.yml" do
+    path "#{rails_directory}/config/application.yml"
     owner new_resource.user
     group new_resource.group
     mode 0o664
     content application_yml
     notifies :run, "execute[#{rails_directory}/public/assets]"
+    only_if { ::File.exist?("#{rails_directory}/config/example.application.yml") }
   end
 
-  settings = new_resource.slice(
+  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") }
+  end
+
+  settings = new_resource.to_hash.transform_keys(&:to_s).slice(
     "email_from",
     "status",
     "messages_domain",
     "attachments_dir",
     "log_path",
     "logstash_path",
-    "memcache_servers",
     "potlatch2_key",
     "id_key",
     "oauth_key",
@@ -305,24 +307,28 @@ action :create do
     "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",
-    "csp_report_url"
-  ).merge(
+    "csp_report_url",
+    "trace_use_job_queue"
+  ).reject { |_k, v| v.nil? }.merge(
     "server_protocol" => "https",
-    "server" => new_resource.site,
+    "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",
-    "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"
@@ -334,7 +340,7 @@ action :create do
     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
 
   if new_resource.piwik_configuration