Skip to content

Commit

Permalink
deprecate environment variable $WIKI_CONFIG
Browse files Browse the repository at this point in the history
  • Loading branch information
minad committed Nov 15, 2012
1 parent c94d29f commit 4713fcb
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions config.ru
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Olelo::Config.instance['plugins_path'] = ::File.join(app_path, 'plugins')
Olelo::Config.instance['rack.session_secret'] = SecureRandom.hex
Olelo::Config.instance.load!(::File.join(app_path, 'config', 'config.yml.default'))

puts 'WARNING: Environment variable $WIKI_CONFIG is deprecated, use $OLELO_CONFIG instead' if ENV['WIKI_CONFIG']

config_file = ENV['OLELO_CONFIG'] || ENV['WIKI_CONFIG']
unless config_file
path = ::File.join(app_path, 'config', 'config.yml')
Expand Down

0 comments on commit 4713fcb

Please sign in to comment.