mirror of
https://github.com/discourse/discourse.git
synced 2025-02-18 16:42:45 +08:00
FIX: hide dangerous dev only site settings in production
(port/force hostname/queue jobs)
This commit is contained in:
parent
81e91f3fd7
commit
65156bd8f6
|
@ -589,12 +589,22 @@ rate_limits:
|
||||||
max_replies_in_first_day: 10
|
max_replies_in_first_day: 10
|
||||||
|
|
||||||
developer:
|
developer:
|
||||||
force_hostname: ''
|
force_hostname:
|
||||||
|
hidden:
|
||||||
|
development: false
|
||||||
|
default: true
|
||||||
|
default: ''
|
||||||
port:
|
port:
|
||||||
|
hidden:
|
||||||
|
development: false
|
||||||
|
default: true
|
||||||
default:
|
default:
|
||||||
development: 3000
|
development: 3000
|
||||||
default: ''
|
default: ''
|
||||||
queue_jobs:
|
queue_jobs:
|
||||||
|
hidden:
|
||||||
|
development: false
|
||||||
|
default: true
|
||||||
default:
|
default:
|
||||||
test: false
|
test: false
|
||||||
default: true
|
default: true
|
||||||
|
|
|
@ -6,17 +6,24 @@ class SiteSettings::YamlLoader
|
||||||
@file = file
|
@file = file
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def env_val(value)
|
||||||
|
if value.is_a?(Hash)
|
||||||
|
value.has_key?(Rails.env) ? value[Rails.env] : value['default']
|
||||||
|
else
|
||||||
|
value
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def load
|
def load
|
||||||
yaml = YAML.load_file(@file)
|
yaml = YAML.load_file(@file)
|
||||||
yaml.keys.each do |category|
|
yaml.keys.each do |category|
|
||||||
yaml[category].each do |setting_name, hash|
|
yaml[category].each do |setting_name, hash|
|
||||||
if hash.is_a?(Hash)
|
if hash.is_a?(Hash)
|
||||||
# Get default value for the site setting:
|
# Get default value for the site setting:
|
||||||
value = hash.delete('default')
|
value = env_val(hash.delete('default'))
|
||||||
|
|
||||||
# If there's a different default value for each environment, choose the right one:
|
if hash.key?('hidden')
|
||||||
if value.is_a?(Hash)
|
hash['hidden'] = env_val(hash.delete('hidden'))
|
||||||
value = value.has_key?(Rails.env) ? value[Rails.env] : value['default']
|
|
||||||
end
|
end
|
||||||
|
|
||||||
yield category, setting_name, value, hash.symbolize_keys!
|
yield category, setting_name, value, hash.symbolize_keys!
|
||||||
|
@ -27,4 +34,4 @@ class SiteSettings::YamlLoader
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user