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

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index 75e38f0..e159b09 100644
--- a/lib/mailshears.rb
+++ b/lib/mailshears.rb
@@ -5,7 +5,17 @@ require 'mailshears/errors.rb'
 require 'mailshears/exit_codes.rb'
 require 'mailshears/postfixadmin_db'
 
-Configuration::PLUGINS.each do |plugin_file|
+# Load the default config file first, and let the user override it.
+require 'default_configuration'
+
+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|
   require "mailshears/plugins/#{plugin_file}"
 end