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

[mailshears.git] / bin / mailshears

diff --git a/bin/mailshears b/bin/mailshears
index 96a3c303777269d9a1a32c8110f6821478fbae15..b1a5e00e1d66885f7ceed478f6031912b540429f 100755 (executable)
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -15,16 +15,13 @@
 
 require 'mailshears'
 
-# Load our config file.
-require 'configuration'
-
-pgadb = PostfixadminDb.new(Configuration::DBHOST,
-                           Configuration::DBPORT,
-                           Configuration::DBOPTS,
-                           Configuration::DBTTY,
-                           Configuration::DBNAME,
-                           Configuration::DBUSER,
-                           Configuration::DBPASS)
+pgadb = PostfixadminDb.new(Configuration::dbhost,
+                           Configuration::dbport,
+                           Configuration::dbopts,
+                           Configuration::dbtty,
+                           Configuration::dbname,
+                           Configuration::dbuser,
+                           Configuration::dbpass)
 
 
 begin
@@ -87,7 +84,7 @@ Plugin.includers.each do |plugin_class|
       puts "Found: #{account} (#{plugin.describe_account(account)})"
     end
 
-    if Configuration::I_MEAN_BUSINESS
+    if Configuration::i_mean_business
       # We have to delete the accounts before the domain,
       # otherwise they'd already be gone.
       leftover_accounts.each do |account|