From e6dc39751681424a4fe003077fd722ce13236588 Mon Sep 17 00:00:00 2001
From: Erin Bleiweiss <erin_bleiweiss@rapid7.com>
Date: Fri, 25 Jan 2019 13:15:45 -0600
Subject: [PATCH] Actually delete files on a web service delete

---
 msfdb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/msfdb b/msfdb
index 301d1608fe..0d9a44d33e 100755
--- a/msfdb
+++ b/msfdb
@@ -70,7 +70,7 @@ require 'msf/util/helper'
     add_data_service: true,
     data_service_name: nil,
     use_defaults: false,
-    delete_existing_data: false
+    delete_existing_data: true
 }
 
 def supports_color?
@@ -575,6 +575,10 @@ end
 
 def delete_web_service
   stop_web_service
+
+  File.delete(@ws_pid) if web_service_pid_status == WebServicePIDStatus::INACTIVE
+  File.delete(@options[:ssl_key]) if File.file?(@options[:ssl_key])
+  File.delete(@options[:ssl_cert]) if File.file?(@options[:ssl_cert])
 end
 
 def reinit_web_service