Disable promscale

[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 564cbd0adf1cd5e8498ebe40b5054f4fde649eca..fd1522204c482a574e1eca99df5093a490586a78 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -54,7 +54,7 @@ property :id_key, String
 property :oauth_key, String
 property :oauth_application, String
 property :nominatim_url, String
-property :osrm_url, String
+property :overpass_url, String
 property :google_auth_id, String
 property :google_auth_secret, String
 property :google_openid_realm, String
@@ -226,8 +226,8 @@ action :create do
       line.gsub!(/^( *)nominatim_url:.*$/, "\\1nominatim_url: \"#{new_resource.nominatim_url}\"")
     end
 
-    if new_resource.osrm_url
-      line.gsub!(/^( *)osrm_url:.*$/, "\\1osrm_url: \"#{new_resource.osrm_url}\"")
+    if new_resource.overpass_url
+      line.gsub!(/^( *)overpass_url:.*$/, "\\1overpass_url: \"#{new_resource.overpass_url}\"")
     end
 
     if new_resource.google_auth_id
@@ -306,7 +306,7 @@ action :create do
     "oauth_key",
     "oauth_application",
     "nominatim_url",
-    "osrm_url",
+    "overpass_url",
     "google_auth_id",
     "google_auth_secret",
     "google_openid_realm",
@@ -407,7 +407,7 @@ action :create do
 
   execute "#{rails_directory}/package.json" do
     action :nothing
-    command "yarnpkg install --ignore-engines"
+    command "bundle#{new_resource.ruby} exec rake yarn:install"
     environment "HOME" => rails_directory,
                 "RAILS_ENV" => "production"
     cwd rails_directory