summaryrefslogtreecommitdiff
path: root/lib/tapicero.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/tapicero.rb')
-rw-r--r--lib/tapicero.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/tapicero.rb b/lib/tapicero.rb
index 0c7007f..390257d 100644
--- a/lib/tapicero.rb
+++ b/lib/tapicero.rb
@@ -1,9 +1,6 @@
unless defined? BASE_DIR
BASE_DIR = Pathname.new(__FILE__) + '../..'
end
-unless defined? TAPICERO_CONFIG
- TAPICERO_CONFIG = '/etc/leap/tapicero.yaml'
-end
module Tapicero
class <<self
@@ -18,8 +15,7 @@ module Tapicero
# defined before the models are defined.
#
require 'couchrest/changes'
- configs = ['config/default.yaml', TAPICERO_CONFIG, ARGV.grep(/\.ya?ml$/).first]
- self.config = CouchRest::Changes::Config.load(BASE_DIR, *configs)
+ self.config = CouchRest::Changes::Config.load(BASE_DIR, *CONFIGS)
self.logger = CouchRest::Changes::Config.logger
# hand flags over to CouchRest::Changes