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

[mailshears.git] / bin / mailshears

diff --git a/bin/mailshears b/bin/mailshears
index b1a5e00e1d66885f7ceed478f6031912b540429f..d181d0834f70a84492530a779a6b022c9ee2c674 100755 (executable)
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -15,13 +15,14 @@
 
 require 'mailshears'
 
-pgadb = PostfixadminDb.new(Configuration::dbhost,
-                           Configuration::dbport,
-                           Configuration::dbopts,
-                           Configuration::dbtty,
-                           Configuration::dbname,
-                           Configuration::dbuser,
-                           Configuration::dbpass)
+cfg = Configuration.new()
+pgadb = PostfixadminDb.new(cfg.dbhost,
+                           cfg.dbport,
+                           cfg.dbopts,
+                           cfg.dbtty,
+                           cfg.dbname,
+                           cfg.dbuser,
+                           cfg.dbpass)
 
 
 begin
@@ -84,7 +85,7 @@ Plugin.includers.each do |plugin_class|
       puts "Found: #{account} (#{plugin.describe_account(account)})"
     end
 
-    if Configuration::i_mean_business
+    if cfg.i_mean_business
       # We have to delete the accounts before the domain,
       # otherwise they'd already be gone.
       leftover_accounts.each do |account|