From 472a65c0e5f123c29c8e84b1ae33d29bcee3ed3f Mon Sep 17 00:00:00 2001 From: Evandro Jr Date: Wed, 30 Dec 2015 11:46:23 -0300 Subject: [PATCH] allows erb templates in_database.yml --- lib/noosfero/multi_tenancy.rb | 4 ++-- lib/tasks/backup.rake | 3 ++- script/odbcconf | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/noosfero/multi_tenancy.rb b/lib/noosfero/multi_tenancy.rb index dfe97c6..ee829e9 100644 --- a/lib/noosfero/multi_tenancy.rb +++ b/lib/noosfero/multi_tenancy.rb @@ -26,7 +26,7 @@ module Noosfero def self.load_map db_file = Rails.root.join('config', 'database.yml') - db_config = YAML.load_file(db_file) + db_config = YAML.load(ERB.new(File.read(db_file)).result) map = { } db_config.each do |env, attr| next unless env.match(/_#{Rails.env}$/) and attr['adapter'] =~ /^postgresql$/i @@ -37,7 +37,7 @@ module Noosfero def self.is_hosted_environment? db_file = Rails.root.join('config', 'database.yml') - db_config = YAML.load_file(db_file) + db_config = YAML.load(ERB.new(File.read(db_file)).result) db_config.select{ |env, attr| Rails.env.to_s.match(/_#{env}$/) }.any? end diff --git a/lib/tasks/backup.rake b/lib/tasks/backup.rake index 9e7a84e..c5f7320 100644 --- a/lib/tasks/backup.rake +++ b/lib/tasks/backup.rake @@ -1,5 +1,6 @@ task :load_backup_config do - $config = YAML.load_file('config/database.yml') + db_file = Rails.root.join('config', 'database.yml') + $config = YAML.load(ERB.new(File.read(db_file)).result) end task :check_backup_support => :load_backup_config do diff --git a/script/odbcconf b/script/odbcconf index 323437d..f561469 100755 --- a/script/odbcconf +++ b/script/odbcconf @@ -1,8 +1,9 @@ #!/usr/bin/env ruby require 'yaml' -config = YAML.load_file(File.dirname(__FILE__) + '/../config/database.yml')['production'] +require 'erb' +config = YAML.load(ERB.new(File.read(File.dirname(__FILE__) + '/../config/database.yml')).result)['production'] puts "[PostgreSQLEjabberdNoosfero]" puts "Description = PostgreSQL Noosfero ejabberd database" -- libgit2 0.21.2