Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Settings for providers #10944

Merged
merged 1 commit into from
Dec 9, 2016
Merged

[WIP] Settings for providers #10944

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions lib/vmdb/settings.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,21 +109,32 @@ def self.build_without_local(resource)
end
private_class_method :build_without_local

def self.template_roots
Vmdb::Plugins.instance.vmdb_plugins.each_with_object([Rails.root.join('config')]) do |plugin, roots|
roots << plugin.root.join('config')
end
end
private_class_method :template_roots

def self.template_sources
[
Rails.root.join("config/settings.yml").to_s,
Rails.root.join("config/settings/#{Rails.env}.yml").to_s,
Rails.root.join("config/environments/#{Rails.env}.yml").to_s
]
template_roots.each_with_object([]) do |root, sources|
sources.push(
root.join("settings.yml").to_s,
root.join("settings/#{Rails.env}.yml").to_s,
root.join("environments/#{Rails.env}.yml").to_s
)
end
end
private_class_method :template_sources

def self.local_sources
[
Rails.root.join("config/settings.local.yml").to_s,
Rails.root.join("config/settings/#{Rails.env}.local.yml").to_s,
Rails.root.join("config/environments/#{Rails.env}.local.yml").to_s
]
template_roots.each_with_object([]) do |root, sources|
sources.push(
root.join("settings.local.yml").to_s,
root.join("settings/#{Rails.env}.local.yml").to_s,
root.join("environments/#{Rails.env}.local.yml").to_s
)
end
end
private_class_method :local_sources

Expand Down