X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fprune%2Fprune_runner.rb;h=8ae8ad218bcbc402e167509dca190ab62cbec5fb;hp=74455d6b2ba8903655ce385b8e4c16d81ad4ccf6;hb=a66e4a7e39518629981fa134456dc2ae6c461faf;hpb=4e7ef12d3d47aa7ec68419de46c51269c40eb158

diff --git a/lib/prune/prune_runner.rb b/lib/prune/prune_runner.rb
index 74455d6..8ae8ad2 100644
--- a/lib/prune/prune_runner.rb
+++ b/lib/prune/prune_runner.rb
@@ -1,7 +1,6 @@
 require 'common/runner'
-
-# This is always needed, regardless of which plugin is running.
 require 'prune/plugins/postfixadmin'
+require 'rm/rm_runner'
 
 class PruneRunner
   include Runner
@@ -10,26 +9,17 @@ class PruneRunner
     # We don't want to check the PostfixAdmin database against itself.
     return if plugin.class == PostfixadminPrune
 
-    pfa = PostfixadminPrune.new()
+    cfg = Configuration.new()
+    pfa = PostfixadminPrune.new(cfg)
 
     db_users = pfa.list_users()
     db_domains = pfa.list_domains()
 
-    leftover_users = plugin.get_leftover_accounts(db_users)
-    leftover_domains = plugin.get_leftover_domains(db_domains)
-
-    leftover_users.each do |user|
-      user_description = plugin.describe_account(user)
-      plugin.delete_account(user)
-      report(plugin, "Removed user: #{user} (#{user_description})")
-    end
-
-    leftover_domains.each do |domain|
-      domain_description = plugin.describe_domain(domain)
-      plugin.delete_domain(domain)
-      report(plugin, "Removed domain: #{domain} (#{domain_description})")
-    end
+    leftovers  = plugin.get_leftover_users(db_users)
+    leftovers += plugin.get_leftover_domains(db_domains)
 
+    rm_runner = RmRunner.new()
+    rm_runner.run(plugin, *leftovers)
   end
 
 end