X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3d9b73d7e89d4b4266840a2f5fb7f90061d5c1b6..0993dbc450a5678cfcea86dd71cf5873b18d86f3:/cookbooks/web/definitions/rails_port.rb diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index fe60c1c64..6985528bb 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -110,8 +110,8 @@ define :rails_port, :action => [:create, :enable] do 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: \"#{name}\"") + line.gsub!(/^( *)server_protocol:.*$/, "\\1server_protocol: \"https\"") + line.gsub!(/^( *)server_url:.*$/, "\\1server_url: \"#{name}\"") line.gsub!(/^( *)#publisher_url:.*$/, "\\1publisher_url: \"https://plus.google.com/111953119785824514010\"") @@ -216,6 +216,10 @@ define :rails_port, :action => [:create, :enable] do line.gsub!(/^( *)#totp_key:.*$/, "\\1totp_key: \"#{params[:totp_key]}\"") end + if params[:csp_report_url] + line.gsub!(/^( *)#csp_report_url:.*$/, "\\1csp_report_url: \"#{params[:csp_report_url]}\"") + end + line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true") line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")