summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavor <vorgrimmlerdavid@gmx.de>2012-08-09 17:21:19 +0200
committerdavor <vorgrimmlerdavid@gmx.de>2012-08-09 17:21:19 +0200
commit2667f4fb16d4773b26d80e4bd54e46d73ce94fd0 (patch)
tree6f2895d0e6d35ad28a3c165770d79b62e729ef92
parent39197c9e11837613bd83d5dd77fc9aaf1e454787 (diff)
Added default config.
-rw-r--r--lib/opentox.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/opentox.rb b/lib/opentox.rb
index 3d1092a..ac66b57 100644
--- a/lib/opentox.rb
+++ b/lib/opentox.rb
@@ -1,7 +1,8 @@
require 'sinatra/base'
ENV["RACK_ENV"] ||= "production"
require "sinatra/reloader" if ENV["RACK_ENV"] == "development"
-require File.join(ENV["HOME"],".opentox","config","#{SERVICE}.rb")
+require File.join(ENV["HOME"],".opentox","config","default.rb")
+require File.join(ENV["HOME"],".opentox","config","#{SERVICE}.rb") if File.exist?(File.join(ENV["HOME"],".opentox","config","#{SERVICE}.rb"))
logfile = File.join(ENV['HOME'], ".opentox","log","#{ENV["RACK_ENV"]}.log")