Download as
Browse Code »

Commit 472a65c0e5f123c29c8e84b1ae33d29bcee3ed3f

Authored by Evandro Jr
1 parent 1eeb24c6
Exists in staging and in 38 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

allows erb templates in_database.yml

Showing 3 changed files with 6 additions and 4 deletions   Show diff stats
lib/noosfero/multi_tenancy.rb
  Diff comments   View file @472a65c
... ... @@ -26,7 +26,7 @@ module Noosfero
26 26  
27 27 def self.load_map
28 28 db_file = Rails.root.join('config', 'database.yml')
29   - db_config = YAML.load_file(db_file)
  29 + db_config = YAML.load(ERB.new(File.read(db_file)).result)
30 30 map = { }
31 31 db_config.each do |env, attr|
32 32 next unless env.match(/_#{Rails.env}$/) and attr['adapter'] =~ /^postgresql$/i
... ... @@ -37,7 +37,7 @@ module Noosfero
37 37  
38 38 def self.is_hosted_environment?
39 39 db_file = Rails.root.join('config', 'database.yml')
40   - db_config = YAML.load_file(db_file)
  40 + db_config = YAML.load(ERB.new(File.read(db_file)).result)
41 41 db_config.select{ |env, attr| Rails.env.to_s.match(/_#{env}$/) }.any?
42 42 end
43 43  
... ...
lib/tasks/backup.rake
  Diff comments   View file @472a65c
1 1 task :load_backup_config do
2   - $config = YAML.load_file('config/database.yml')
  2 + db_file = Rails.root.join('config', 'database.yml')
  3 + $config = YAML.load(ERB.new(File.read(db_file)).result)
3 4 end
4 5  
5 6 task :check_backup_support => :load_backup_config do
... ...
script/odbcconf
  Diff comments   View file @472a65c
1 1 #!/usr/bin/env ruby
2 2  
3 3 require 'yaml'
4   -config = YAML.load_file(File.dirname(__FILE__) + '/../config/database.yml')['production']
  4 +require 'erb'
5 5  
  6 +config = YAML.load(ERB.new(File.read(File.dirname(__FILE__) + '/../config/database.yml')).result)['production']
6 7  
7 8 puts "[PostgreSQLEjabberdNoosfero]"
8 9 puts "Description = PostgreSQL Noosfero ejabberd database"
... ...