X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=bin%2Fmailshears;h=5d1c7982dd6978939fce3edbeb9480d68c4e19f8;hp=96a3c303777269d9a1a32c8110f6821478fbae15;hb=566f5fe84f82bb26e86b0902d65fc89693e9d813;hpb=314f5670531dfda9b3d708fce8b0161a098cf134

diff --git a/bin/mailshears b/bin/mailshears
index 96a3c30..5d1c798 100755
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -15,16 +15,14 @@
 
 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)
+cfg = Configuration.new()
+pgadb = PostfixadminDb.new(cfg.dbhost,
+                           cfg.dbport,
+                           cfg.dbopts,
+                           cfg.dbtty,
+                           cfg.dbname,
+                           cfg.dbuser,
+                           cfg.dbpass)
 
 
 begin
@@ -72,10 +70,10 @@ Plugin.includers.each do |plugin_class|
       header += current_time.iso8601.to_s
     else
       # Fall back to whatever this looks like.
-      header += current_time.to_s + "\n"
+      header += current_time.to_s
     end
 
-    header += 'Plugin: ' + plugin_class.to_s + "\n"
+    header += ' (Plugin: ' + plugin_class.to_s + ")\n"
     puts header
     puts '-' * header.size # Underline the header.
 
@@ -87,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|
@@ -97,7 +95,7 @@ Plugin.includers.each do |plugin_class|
         plugin.delete_account(account)
         puts "Removed: #{account} (#{account_description})"
       end
-      
+
       leftover_domains.each do |domain|
         # Get the description before we delete the domain.
         domain_description = plugin.describe_domain(domain)