Add support for configuring rails using settings.local.yml

[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 3c57a98d3b913316c0692ee9a41489e66d8fe8b8..e3276da2c5b3c6e8bbfb933aacd535a65ded09b4 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -61,8 +61,6 @@ 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 :csp_enforce, [TrueClass, FalseClass], :default => false
 property :thunderforest_key, String
 property :totp_key, String
 property :csp_enforce, [TrueClass, FalseClass], :default => false


@@ -102,18 +100,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


@@ -129,9 +123,10 @@ action :create do
     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


@@ -155,7 +150,7 @@ 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|
   end
 
   application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line|


@@ -275,11 +270,13 @@ action :create do
 
     line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
     line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")
 
     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
 
   file "#{rails_directory}/config/application.yml" do
 
     line
   end
 
   file "#{rails_directory}/config/application.yml" do

+    action(lazy { File.exist?("#{rails_directory}/config/example.application.yml") ? :create : :delete })

     owner new_resource.user
     group new_resource.group
     mode 0o664
     owner new_resource.user
     group new_resource.group
     mode 0o664


@@ -287,6 +284,59 @@ action :create do
     notifies :run, "execute[#{rails_directory}/public/assets]"
   end
 
     notifies :run, "execute[#{rails_directory}/public/assets]"
   end
 

+  settings = new_resource.slice(
+    "email_from",
+    "status",
+    "messages_domain",
+    "attachments_dir",
+    "log_path",
+    "logstash_path",
+    "memcache_servers",
+    "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",
+    "gihub_auth_secret",
+    "wikipedia_auth_id",
+    "wikipedia_auth_secret",
+    "thunderforest_key",
+    "totp_key",
+    "csp_enforce",
+    "csp_report_url"
+  ).merge(
+    "server_protocol" => "https",
+    "server" => 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
+  )
+
+  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
+

   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


@@ -310,7 +360,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


@@ -320,10 +370,20 @@ 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}/app/assets/javascripts/i18n" do
+    action :nothing
+    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
+    notifies :run, "execute[#{rails_directory}/public/assets]"
+  end
+

   execute "#{rails_directory}/public/assets" do
     action :nothing
     command "bundle#{new_resource.ruby} exec rake assets:precompile"
   execute "#{rails_directory}/public/assets" do
     action :nothing
     command "bundle#{new_resource.ruby} exec rake assets:precompile"


@@ -331,18 +391,15 @@ action :create do
     cwd rails_directory
     user new_resource.user
     group new_resource.group
     cwd rails_directory
     user new_resource.user
     group new_resource.group

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

   end
 
   file "#{rails_directory}/public/export/embed.html" do
     action :nothing
   end
 
   end
 
   file "#{rails_directory}/public/export/embed.html" do
     action :nothing
   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
 


@@ -357,11 +414,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