X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmailshears.rb;h=287ee2b9619ef3b2c7466000e147e5a101a6f675;hp=e159b09b3b6ca6c93dce474a1d0106b1ae261b42;hb=193830c933ffd45001bc52849d0068d435303fa6;hpb=451f1c3175c1a3c8670f51ebc907102d8c99820d

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index e159b09..287ee2b 100644
--- a/lib/mailshears.rb
+++ b/lib/mailshears.rb
@@ -1,21 +1,13 @@
 # Load the rest of the code we'll use.
 
 # And the necessary classes.
-require 'mailshears/errors.rb'
-require 'mailshears/exit_codes.rb'
+require 'mailshears/configuration'
+require 'mailshears/errors'
+require 'mailshears/exit_codes'
 require 'mailshears/postfixadmin_db'
 
-# Load the default config file first, and let the user override it.
-require 'default_configuration'
+cfg = Configuration.new()
 
-userconf_path = ENV['HOME'] + '/.mailshears.conf.rb'
-begin
-  # Don't crash if it doesn't exist. Maybe he likes the defaults?
-  require userconf_path
-rescue LoadError
-end
-
-Configuration::plugins.each do |plugin_file|
+cfg.plugins.each do |plugin_file|
   require "mailshears/plugins/#{plugin_file}"
 end
-