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 5a8ee0a6752064292274d585e16dc38c4bb39d51..d181d0834f70a84492530a779a6b022c9ee2c674 100755 (executable)
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -13,28 +13,16 @@
 # filesystem, but not the database.
 #
 
-# Needed for rm_rf.
-require 'fileutils'
+require 'mailshears'
 
-# Load our config file.
-require 'configuration'
-
-# And the necessary classes.
-require 'errors.rb'
-require 'exit_codes.rb'
-require 'postfixadmin_db'
-
-Configuration::PLUGINS.each do |plugin_file|
-  require "plugins/#{plugin_file}"
-end
-
-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
@@ -97,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|