From 8d7f3bd070a2ffe8a86e79299be37da9c687dee5 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 20 Oct 2016 21:07:45 +0100 Subject: [PATCH 1/1] Remove quova settings --- cookbooks/web/definitions/rails_port.rb | 5 ----- cookbooks/web/recipes/rails.rb | 2 -- 2 files changed, 7 deletions(-) diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index dc39d4457..51a56e9e7 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -122,11 +122,6 @@ define :rails_port, :action => [:create, :enable] do line.gsub!(/^( *)#geonames_username:.*$/, "\\1geonames_username: \"openstreetmap\"") - if params[:quova_username] - line.gsub!(/^( *)#quova_username:.*$/, "\\1quova_username: \"#{params[:quova_username]}\"") - line.gsub!(/^( *)#quova_password:.*$/, "\\1quova_password: \"#{params[:quova_password]}\"") - end - if params[:gpx_dir] line.gsub!(/^( *)gpx_trace_dir:.*$/, "\\1gpx_trace_dir: \"#{params[:gpx_dir]}/traces\"") line.gsub!(/^( *)gpx_image_dir:.*$/, "\\1gpx_image_dir: \"#{params[:gpx_dir]}/images\"") diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index 02c094359..7945d3d03 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -58,8 +58,6 @@ rails_port "www.openstreetmap.org" do email_from "OpenStreetMap " status node[:web][:status] messages_domain "messages.openstreetmap.org" - quova_username "ws360602" - quova_password web_passwords["quova"] gpx_dir "/store/rails/gpx" attachments_dir "/store/rails/attachments" log_path "#{node[:web][:log_directory]}/rails.log" -- 2.43.2