X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmailshears.rb;h=f4e75f7e3069a6c21a28b5bc20ca3f836a94f98b;hp=0402d602be047da95203f6fab5391bb2850a1171;hb=a4db2e7eaaf9d17f9250d601bf82b58bdb2681d2;hpb=a3b629b37a05b97d67620284d1c4536427fc5058

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index 0402d60..f4e75f7 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'
-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|
+Configuration.plugins.each do |plugin_file|
   require "mailshears/plugins/#{plugin_file}"
 end
-