Update the rest of the code to use the new Configuration class.

[mailshears.git] / lib / mailshears.rb

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index e159b09b3b6ca6c93dce474a1d0106b1ae261b42..f4e75f7e3069a6c21a28b5bc20ca3f836a94f98b 100644 (file)
--- 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|
+Configuration.plugins.each do |plugin_file|
   require "mailshears/plugins/#{plugin_file}"
 end
-