Update rubocop configuration for COP renames

[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 a27dc085d18a35cae22f664444826a3096c9998e..2e7a12e404e1dd942cae79f6100bd10d45fafee1 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.


@@ -23,14 +23,14 @@ resource_name :rails_port
 
 default_action :create
 
 
 default_action :create
 

-property :site, String, :name_attribute => true
+property :site, String, :name_property => true

 property :ruby, String, :default => "2.3"
 property :directory, String
 property :user, String
 property :group, String
 property :ruby, String, :default => "2.3"
 property :directory, String
 property :user, String
 property :group, String

-property :repository, String, :default => "git://git.openstreetmap.org/rails.git"
+property :repository, String, :default => "https://git.openstreetmap.org/public/rails.git"

 property :revision, String, :default => "live"
 property :revision, String, :default => "live"

-property :run_migrations, [TrueClass, FalseClass], :default => false
+property :run_migrations, [true, false], :default => false

 property :email_from, String, :default => "OpenStreetMap <support@openstreetmap.org>"
 property :status, String, :default => "online"
 property :database_host, String
 property :email_from, String, :default => "OpenStreetMap <support@openstreetmap.org>"
 property :status, String, :default => "online"
 property :database_host, String


@@ -61,12 +61,16 @@ 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 :thunderforest_key, String
 property :totp_key, String

+property :csp_enforce, [true, false], :default => false

 property :csp_report_url, String
 property :piwik_configuration, Hash
 property :csp_report_url, String
 property :piwik_configuration, Hash

+property :trace_use_job_queue, [true, false], :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[


@@ -75,6 +79,7 @@ action :create do
     imagemagick
     nodejs
     geoip-database
     imagemagick
     nodejs
     geoip-database

+    tzdata

   ]
 
   package %w[
   ]
 
   package %w[


@@ -85,6 +90,10 @@ action :create do
     libxml2-dev
     libxslt1-dev
     libmemcached-dev
     libxml2-dev
     libxslt1-dev
     libmemcached-dev

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

   ]
 
   package %w[
   ]
 
   package %w[


@@ -100,18 +109,14 @@ action :create do
 
   gem_package "bundler#{new_resource.ruby}" do
     package_name "bundler"
 
   gem_package "bundler#{new_resource.ruby}" do
     package_name "bundler"

-    version "1.3.5"
+    version "1.16.2"

     gem_binary "gem#{new_resource.ruby}"
     options "--format-executable"
   end
 
     gem_binary "gem#{new_resource.ruby}"
     options "--format-executable"
   end
 

-  file "/usr/lib/ruby/1.8/rack.rb" do
-    action :delete
-  end
-
-  declare_resource :directory, "/usr/lib/ruby/1.8/rack" do
-    action :delete
-    recursive true
+  gem_package "bundler#{new_resource.ruby}" do
+    package_name "pkg-config"
+    gem_binary "gem#{new_resource.ruby}"

   end
 
   declare_resource :directory, rails_directory do
   end
 
   declare_resource :directory, rails_directory do


@@ -124,12 +129,14 @@ action :create do
     action :sync
     repository new_resource.repository
     revision new_resource.revision
     action :sync
     repository new_resource.repository
     revision new_resource.revision

+    depth 1

     user new_resource.user
     group new_resource.group
     notifies :run, "execute[#{rails_directory}/Gemfile]"
     user new_resource.user
     group new_resource.group
     notifies :run, "execute[#{rails_directory}/Gemfile]"

+    notifies :run, "execute[#{rails_directory}/app/assets/javascripts/i18n]"

     notifies :run, "execute[#{rails_directory}/public/assets]"
     notifies :delete, "file[#{rails_directory}/public/export/embed.html]"
     notifies :run, "execute[#{rails_directory}/public/assets]"
     notifies :delete, "file[#{rails_directory}/public/export/embed.html]"

-    notifies :run, "execute[#{rails_directory}]"
+    notifies :restart, "passenger_application[#{rails_directory}]"

   end
 
   declare_resource :directory, "#{rails_directory}/tmp" do
   end
 
   declare_resource :directory, "#{rails_directory}/tmp" do


@@ -153,15 +160,13 @@ action :create do
               :name => new_resource.database_name,
               :username => new_resource.database_username,
               :password => new_resource.database_password
               :name => new_resource.database_name,
               :username => new_resource.database_username,
               :password => new_resource.database_password

-    notifies :run, "execute[#{rails_directory}]"
+    notifies :restart, "passenger_application[#{rails_directory}]"

   end
 
   application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line|
     line.gsub!(/^( *)server_protocol:.*$/, "\\1server_protocol: \"https\"")
     line.gsub!(/^( *)server_url:.*$/, "\\1server_url: \"#{new_resource.site}\"")
 
   end
 
   application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line|
     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


@@ -179,6 +184,7 @@ action :create do
     line.gsub!(/^( *)#geonames_username:.*$/, "\\1geonames_username: \"openstreetmap\"")
 
     line.gsub!(/^( *)#geoip_database:.*$/, "\\1geoip_database: \"/usr/share/GeoIP/GeoIPv6.dat\"")
     line.gsub!(/^( *)#geonames_username:.*$/, "\\1geonames_username: \"openstreetmap\"")
 
     line.gsub!(/^( *)#geoip_database:.*$/, "\\1geoip_database: \"/usr/share/GeoIP/GeoIPv6.dat\"")

+    line.gsub!(/^( *)#maxmind_database:.*$/, "\\1maxmind_database: \"/usr/share/GeoIP/GeoLite2-Country.mmdb\"")

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


@@ -247,14 +253,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


@@ -263,22 +261,109 @@ action :create do
       line.gsub!(/^( *)#totp_key:.*$/, "\\1totp_key: \"#{new_resource.totp_key}\"")
     end
 
       line.gsub!(/^( *)#totp_key:.*$/, "\\1totp_key: \"#{new_resource.totp_key}\"")
     end
 

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

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

+    line.gsub!(/^( *)trace_use_job_queue:.*$/, "\\1trace_use_job_queue: false")

 
     line
   end
 
 
     line
   end
 

-  file "#{rails_directory}/config/application.yml" do
+  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]"
     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
+
+  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",
+    "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",
+    "github_auth_secret",
+    "wikipedia_auth_id",
+    "wikipedia_auth_secret",
+    "thunderforest_key",
+    "totp_key",
+    "csp_enforce",
+    "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,
+    "support_email" => "support@openstreetmap.org",
+    "email_return_path" => "bounces@openstreetmap.org",
+    "geonames_username" => "openstreetmap",
+    "geoip_database" => "/usr/share/GeoIP/GeoIPv6.dat",
+    "maxmind_database" => "/usr/share/GeoIP/GeoLite2-Country.mmdb"
+  )
+
+  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"
+  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
+
+  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


@@ -304,7 +389,7 @@ action :create do
     group "root"
     environment "NOKOGIRI_USE_SYSTEM_LIBRARIES" => "yes"
     subscribes :run, "gem_package[bundler#{new_resource.ruby}]"
     group "root"
     environment "NOKOGIRI_USE_SYSTEM_LIBRARIES" => "yes"
     subscribes :run, "gem_package[bundler#{new_resource.ruby}]"

-    notifies :run, "execute[#{rails_directory}]"
+    notifies :restart, "passenger_application[#{rails_directory}]"

   end
 
   execute "#{rails_directory}/db/migrate" do
   end
 
   execute "#{rails_directory}/db/migrate" do


@@ -314,52 +399,36 @@ action :create do
     user new_resource.user
     group new_resource.group
     subscribes :run, "git[#{rails_directory}]"
     user new_resource.user
     group new_resource.group
     subscribes :run, "git[#{rails_directory}]"

-    notifies :run, "execute[#{rails_directory}]"
+    notifies :restart, "passenger_application[#{rails_directory}]"

     only_if { new_resource.run_migrations }
   end
 
     only_if { new_resource.run_migrations }
   end
 

-  execute "#{rails_directory}/public/assets" do
+  execute "#{rails_directory}/app/assets/javascripts/i18n" do

     action :nothing
     action :nothing

-    command "bundle#{new_resource.ruby} exec rake assets:precompile"
+    command "bundle#{new_resource.ruby} exec rake i18n:js:export"

     environment "RAILS_ENV" => "production"
     cwd rails_directory
     user new_resource.user
     group new_resource.group
     environment "RAILS_ENV" => "production"
     cwd rails_directory
     user new_resource.user
     group new_resource.group

-    notifies :run, "execute[#{rails_directory}]"
+    notifies :run, "execute[#{rails_directory}/public/assets]"

   end
 
   end
 

-  file "#{rails_directory}/public/export/embed.html" do
+  execute "#{rails_directory}/public/assets" do

     action :nothing
     action :nothing

-  end
-
-  execute "#{rails_directory}/lib/quad_tile/extconf.rb" do
-    command "ruby extconf.rb"
-    cwd "#{rails_directory}/lib/quad_tile"
+    command "bundle#{new_resource.ruby} exec rake assets:precompile"
+    environment "RAILS_ENV" => "production"
+    cwd rails_directory

     user new_resource.user
     group new_resource.group
     user new_resource.user
     group new_resource.group

-    not_if do
-      ::File.exist?("#{rails_directory}/lib/quad_tile/quad_tile_so.so") &&
-        ::File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= ::File.mtime("#{rails_directory}/lib/quad_tile/extconf.rb") &&
-        ::File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= ::File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.c") &&
-        ::File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= ::File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.h")
-    end
-    notifies :run, "execute[#{rails_directory}/lib/quad_tile/Makefile]"
+    notifies :restart, "passenger_application[#{rails_directory}]"

   end
 
   end
 

-  execute "#{rails_directory}/lib/quad_tile/Makefile" do
+  file "#{rails_directory}/public/export/embed.html" do

     action :nothing
     action :nothing

-    command "make"
-    cwd "#{rails_directory}/lib/quad_tile"
-    user new_resource.user
-    group new_resource.group
-    notifies :run, "execute[#{rails_directory}]"

   end
 
   end
 

-  execute rails_directory do
+  passenger_application rails_directory do

     action :nothing
     action :nothing

-    command "passenger-config restart-app --ignore-app-not-running #{rails_directory}"
-    user "root"
-    group "root"

     only_if { ::File.exist?("/usr/bin/passenger-config") }
   end
 
     only_if { ::File.exist?("/usr/bin/passenger-config") }
   end
 


@@ -374,11 +443,8 @@ action :create do
 end
 
 action :restart do
 end
 
 action :restart do

-  execute rails_directory do
-    action :run
-    command "passenger-config restart-app --ignore-app-not-running #{rails_directory}"
-    user "root"
-    group "root"
+  passenger_application rails_directory do
+    action :restart

   end
 end
 
   end
 end