X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=bin%2Fmailshears;h=b1a5e00e1d66885f7ceed478f6031912b540429f;hp=5a8ee0a6752064292274d585e16dc38c4bb39d51;hb=451f1c3175c1a3c8670f51ebc907102d8c99820d;hpb=fd60e4e45d24c7efe5bc2710ae23f60bbb6b7be1 diff --git a/bin/mailshears b/bin/mailshears index 5a8ee0a..b1a5e00 100755 --- a/bin/mailshears +++ b/bin/mailshears @@ -13,28 +13,15 @@ # 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) +pgadb = PostfixadminDb.new(Configuration::dbhost, + Configuration::dbport, + Configuration::dbopts, + Configuration::dbtty, + Configuration::dbname, + Configuration::dbuser, + Configuration::dbpass) begin @@ -97,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|