X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/f7a188f47e729ecb0a53012ce4b238a6904a3358..45dde9418dd342bb1a632d82559201c0b3becf1a:/cookbooks/web/resources/rails_port.rb diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb index 189c01bbf..0a37afe89 100644 --- a/cookbooks/web/resources/rails_port.rb +++ b/cookbooks/web/resources/rails_port.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: web +# Cookbook:: web # Resource:: rails_port # -# Copyright 2012, OpenStreetMap Foundation +# Copyright:: 2012, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -165,8 +165,6 @@ action :create do line.gsub!(/^( *)server_protocol:.*$/, "\\1server_protocol: \"https\"") line.gsub!(/^( *)server_url:.*$/, "\\1server_url: \"#{new_resource.site}\"") - line.gsub!(/^( *)#publisher_url:.*$/, "\\1publisher_url: \"https://plus.google.com/111953119785824514010\"") - line.gsub!(/^( *)support_email:.*$/, "\\1support_email: \"support@openstreetmap.org\"") if new_resource.email_from @@ -325,7 +323,6 @@ action :create do ).reject { |_k, v| v.nil? }.merge( "server_protocol" => "https", "server_url" => new_resource.site, - "publisher_url" => "https://plus.google.com/111953119785824514010", "support_email" => "support@openstreetmap.org", "email_return_path" => "bounces@openstreetmap.org", "geonames_username" => "openstreetmap",