diff options
| author | gebele <gebele@in-silico.ch> | 2012-09-10 13:45:45 +0400 |
|---|---|---|
| committer | gebele <gebele@in-silico.ch> | 2012-09-10 13:45:45 +0400 |
| commit | 1aee5060597078cb5d011fbec858044425956484 (patch) | |
| tree | 5562bee15016b9da2fe5d3afa03dce3796bbc4e2 /lib | |
| parent | a40d23c08b45d2c53450cf5146d096c759b5218d (diff) | |
| parent | 68b616f0a3609c38e91dce2c726ae3b56376e40e (diff) | |
Merge branch 'development' of github.com:/opentox/opentox-server into development
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/opentox.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/opentox.rb b/lib/opentox.rb index 1e7b791..3fb0088 100644 --- a/lib/opentox.rb +++ b/lib/opentox.rb @@ -1,6 +1,7 @@ require 'sinatra/base' require "sinatra/reloader" ENV["RACK_ENV"] ||= "production" +require File.join(ENV["HOME"],".opentox","config","default.rb") if File.exist? File.join(ENV["HOME"],".opentox","config","default.rb") require File.join(ENV["HOME"],".opentox","config","#{SERVICE}.rb") |