Switch from constants to variables in the Configuration module. This should keep...

[mailshears.git] / lib / mailshears.rb

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index 30dd71ebc99130aeb0c128a7433fee5d244b57da..e159b09b3b6ca6c93dce474a1d0106b1ae261b42 100644 (file)
--- a/lib/mailshears.rb
+++ b/lib/mailshears.rb
@@ -8,16 +8,14 @@ require 'mailshears/postfixadmin_db'
 # Load the default config file first, and let the user override it.
 require 'default_configuration'
 
+userconf_path = ENV['HOME'] + '/.mailshears.conf.rb'
 begin
-  # Try to load the user's configuration file.
-  userconf_path = ENV['HOME'] + '/.mailshears.conf'
+  # Don't crash if it doesn't exist. Maybe he likes the defaults?
   require userconf_path
-rescue
-  puts 'No user configuration file (~/.mailshears.conf) found.'
-  puts 'Continuing...'
+rescue LoadError
 end
 
-Configuration::PLUGINS.each do |plugin_file|
+Configuration::plugins.each do |plugin_file|
   require "mailshears/plugins/#{plugin_file}"
 end