Load the default configuration file in lib/mailshears.rb.

Allow the user to load his own configuration file, overriding the defaults.

diff --git a/bin/mailshears b/bin/mailshears
index 96a3c303777269d9a1a32c8110f6821478fbae15..01dcb30f2a2fc2d73d22f36f2f4b43ed92800f42 100755 (executable)
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -15,9 +15,6 @@
 
 require 'mailshears'
 
 
 require 'mailshears'
 

-# Load our config file.
-require 'configuration'
-

 pgadb = PostfixadminDb.new(Configuration::DBHOST,
                            Configuration::DBPORT,
                            Configuration::DBOPTS,
 pgadb = PostfixadminDb.new(Configuration::DBHOST,
                            Configuration::DBPORT,
                            Configuration::DBOPTS,

diff --git a/bin/configuration.rb b/lib/default_configuration.rb
similarity index 100%
rename from bin/configuration.rb
rename to lib/default_configuration.rb

diff --git a/lib/mailshears.rb b/lib/mailshears.rb
index 75e38f0927df7c32df1099805b34a23b0820d430..30dd71ebc99130aeb0c128a7433fee5d244b57da 100644 (file)
--- a/lib/mailshears.rb
+++ b/lib/mailshears.rb
@@ -5,6 +5,18 @@ require 'mailshears/errors.rb'
 require 'mailshears/exit_codes.rb'
 require 'mailshears/postfixadmin_db'
 
 require 'mailshears/exit_codes.rb'
 require 'mailshears/postfixadmin_db'
 

+# Load the default config file first, and let the user override it.
+require 'default_configuration'
+
+begin
+  # Try to load the user's configuration file.
+  userconf_path = ENV['HOME'] + '/.mailshears.conf'
+  require userconf_path
+rescue
+  puts 'No user configuration file (~/.mailshears.conf) found.'
+  puts 'Continuing...'
+end
+

 Configuration::PLUGINS.each do |plugin_file|
   require "mailshears/plugins/#{plugin_file}"
 end
 Configuration::PLUGINS.each do |plugin_file|
   require "mailshears/plugins/#{plugin_file}"
 end