Merge pull request #44 from technoskald/beta3

Beta3 release
krmaxwell · Jun 22, 2014 · 6d0cf25 · 6d0cf25
2 parents f444d22 + 4b772b0
commit 6d0cf25
Show file tree

Hide file tree

Showing 5 changed files with 149 additions and 160 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,9 @@ stash
 
 # vim swap files
 *.swp
+
+# PyCharm IDE directory
+.idea
+
+# virtualenv
+venv
diff --git a/README.md b/README.md
@@ -1,3 +1,10 @@
+```
+ _______ _______        _______  ______ _____ _______ _    _ _______     
+ |  |  | |_____| |         |    |_____/   |   |______  \  /  |______     
+ |  |  | |     | |_____    |    |    \_ __|__ |______   \/   |______     
+                                                                         
+```
+
 Maltrieve
 =========
 
@@ -6,7 +13,6 @@ Maltrieve originated as a fork of [mwcrawler](https://github.com/ricardo-dias/mw
 * [Malc0de](http://malc0de.com/rss)
 * [Malware Black List](http://www.malwareblacklist.com/mbl.xml)
 * [Malware Domain List](http://www.malwaredomainlist.com/hostslist/mdl.xml)
-* [Malware Patrol](http://www.malware.com.br/cgi/submit?action=list)
 * [Sacour.cn](http://www.sacour.cn)
 * [VX Vault](http://vxvault.siri-urz.net/URL_List.php)
 * [URLqery](http://urlquery.net/)
@@ -31,6 +37,7 @@ Dependencies
 * Python 2 (2.6 should be sufficient)
 * [BeautifulSoup](http://www.crummy.com/software/BeautifulSoup/) version 4
 * [lxml](http://lxml.de)
+* [Requests](http://www.python-requests.org)
 
 License
 -------

diff --git a/maltrieve.cfg b/maltrieve.cfg
@@ -0,0 +1,4 @@
+[Maltrieve]
+dumpdir = archive
+logfile = maltrieve.log
+logheaders = true