cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move all settings to settings.yml

Browse source 
We leave the STATUS setting alone, since it's required before rails
boots. The test-specific settings now live in config/settings/test.yml
This commit is contained in:
Andy Allan 2019-03-13 16:38:03 +01:00
parent 7b08270526
commit d102c9aaf4
62 changed files with 316 additions and 349 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/auth.rb
View file

@ -1,9 +1,9 @@
module Auth
PROVIDERS = { "None" => "", "OpenID" => "openid" }.tap do |providers|
providers["Google"] = "google" if defined?(GOOGLE_AUTH_ID)
providers["Facebook"] = "facebook" if defined?(FACEBOOK_AUTH_ID)
providers["Windows Live"] = "windowslive" if defined?(WINDOWSLIVE_AUTH_ID)
providers["GitHub"] = "github" if defined?(GITHUB_AUTH_ID)
providers["Wikipedia"] = "wikipedia" if defined?(WIKIPEDIA_AUTH_ID)
providers["Google"] = "google" if Settings.key?(:google_auth_id)
providers["Facebook"] = "facebook" if Settings.key?(:facebook_auth_id)
providers["Windows Live"] = "windowslive" if Settings.key?(:windowslive_auth_id)
providers["GitHub"] = "github" if Settings.key?(:github_auth_id)
providers["Wikipedia"] = "wikipedia" if Settings.key?(:wikipedia_auth_id)
end.freeze
end

2
lib/bounding_box.rb
View file

@ -69,7 +69,7 @@ class BoundingBox
self
end
def check_size(max_area = MAX_REQUEST_AREA)
def check_size(max_area = Settings.max_request_area)
# check the bbox isn't too large
if area > max_area
raise OSM::APIBadBoundingBox, "The maximum bbox size is " + max_area.to_s +

16
lib/osm.rb
View file

@ -502,16 +502,16 @@ module OSM
end
def xml_root_attributes
{ "version" => API_VERSION.to_s,
"generator" => GENERATOR,
"copyright" => COPYRIGHT_OWNER,
"attribution" => ATTRIBUTION_URL,
"license" => LICENSE_URL }
{ "version" => Settings.api_version,
"generator" => Settings.generator,
"copyright" => Settings.copyright_owner,
"attribution" => Settings.attribution_url,
"license" => Settings.license_url }
end
end
def self.ip_to_country(ip_address)
ipinfo = geoip_database.country(ip_address) if defined?(GEOIP_DATABASE)
ipinfo = geoip_database.country(ip_address) if Settings.key?(:geoip_database)
if ipinfo
country = ipinfo.country_code2
@ -566,7 +566,7 @@ module OSM
# Return the terms and conditions text for a given country
def self.legal_text_for_country(country_code)
file_name = Rails.root.join("config", "legales", country_code.to_s + ".yml")
file_name = Rails.root.join("config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name
file_name = Rails.root.join("config", "legales", Settings.default_legale + ".yml") unless File.exist? file_name
YAML.load_file(file_name)
end
@ -577,6 +577,6 @@ module OSM
# Return the GeoIP database handle
def self.geoip_database
@geoip_database ||= GeoIP.new(GEOIP_DATABASE) if defined?(GEOIP_DATABASE)
@geoip_database ||= GeoIP.new(Settings.geoip_database) if Settings.key?(:geoip_database)
end
end