Download as
Browse Code »

Commit 1e450b5b4204722870e87e0b8a062f53e603343f

Authored by Weblate
2 parents 95f5d867 e1755d7e
Exists in master and in 17 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, web_steps_improvements

Merge remote-tracking branch 'origin/master'

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