X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/11eaf7669c94c2f81a2b7d96f9d5fc19273bbaea..29b8151b8011f934785f3434e3826eee78e61943:/cookbooks/web/resources/rails_port.rb?ds=sidebyside diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb index 16402d243..27cb3b02f 100644 --- a/cookbooks/web/resources/rails_port.rb +++ b/cookbooks/web/resources/rails_port.rb @@ -55,6 +55,7 @@ property :oauth_key, String property :oauth_application, String property :nominatim_url, String property :overpass_url, String +property :overpass_credentials, [true, false], :default => false property :google_auth_id, String property :google_auth_secret, String property :google_openid_realm, String @@ -306,6 +307,7 @@ action :create do "oauth_application", "nominatim_url", "overpass_url", + "overpass_credentials", "google_auth_id", "google_auth_secret", "google_openid_realm", @@ -403,10 +405,6 @@ action :create do only_if { new_resource.run_migrations } end - package "yarnpkg" do - only_if { new_resource.build_assets } - end - bundle_exec "#{rails_directory}/package.json" do action :nothing directory rails_directory @@ -486,7 +484,7 @@ action :restart do end action_class do - include Chef::Mixin::EditFile + include OpenStreetMap::Mixin::EditFile def rails_directory new_resource.directory || "/srv/#{new_resource.site}"