Merge branch 'v2' of github.com:espenfjo/FjoSpidie into v2

README.md

@@ -1,8 +1,12 @@
-FjoSpidie
+FjoSpidie v2
 =========
 
 FjoSpidie Honey Client
 
+This time the spider is written in Python instead of Java.
+
+This version isnt done yet, but it is in development, and the code is lighter, and it has lighter requirements.
+
 This Honey Client will launch Firefox against a given URL and create a HAR of the URL.
 
 This HAR is used to create a PNG over all the domains visited.
@@ -14,9 +18,17 @@ Requirements
 ============
 * xfvb
 * python
-* postgresql
+* libpq-dev
+* java
 * python-setuptools
-* yaml
+* libyaml-dev
+* net-tools (netstat)
+* firefox
+* graphviz
+* snort
+
+
+Install requirements with `apt-get install --force-yes -y -q python python-setuptools libyaml-dev libpq-dev python-dev libpcap-dev git net-tools openjdk-7-jre firefox xvfb graphviz snort`
 
 Build
 =====

ez_setup.py

@@ -7,5 +7,5 @@
     dependency_links = ['https://github.com/espenfjo/browsermob-proxy-py/archive/0.5.1.tar.gz#egg=browsermob-proxy-0.5.1',
 'https://github.com/espenfjo/pylibpcap/archive/0.6.4.1.tar.gz#egg=pylibpcap-0.6.4.1'],
     install_requires=[
-        'selenium', 'pyaml', 'psycopg2', 'browsermob-proxy', 'harpy', 'pydot', 'pylibpcap'],
+        'selenium', 'pyaml', 'psycopg2', 'browsermob-proxy', 'harpy', 'pydot', 'pylibpcap','configobj'],
 )