Connect to docker daemon at standard IP and port 2375, add suricata s…

…ocket directory

README.md

@@ -1,40 +1,12 @@
 FjoSpidie-Interface
 ===================
 
-FjoSpidie Honey Client web interface
-
-`python manage.py runserver`
-
-Or, uwsgi: 
-
-    [uwsgi]
-    chdir=/home/espen/SpidieFace
-    module=SpidieFace.wsgi:application
-    master=True
-    pidfile=/tmp/project-master.pid
-    vacuum=True
-    env DJANGO_SETTINGS_MODULE=SpidieFace.settings
-    home=/home/espen/Sources/fjospidie_virtual
-    max-requests=5000
-    daemonize=/var/log/spidieface.log
-    socket=/tmp/spidie.sock
-    master
-    processes=5
-    plugins=python
-
-=======
-FjoSpidie Interface
-===================
 This is a WEB interface for the FjoSpidie Honey Client.
 It is written in Python and built on django
 
-Building
-========
-* `perl Makefile.PL`
-* `make`
-
 Usage
 =====
-Run script/fjospidie_server.pl to start the application.
+The interface is best run in Docker `docker run --link some-mongo:mongo -p 80:8080 -d espenfjo/spidieface`
+
 
 See https://www.dropbox.com/s/eiwul3ipmqto57s/Screenshot%202013-10-26%2021.35.40.png for how it looks.

reports/jobs.py

@@ -4,7 +4,7 @@
 from django.utils.encoding import smart_str
 
 def job(uuid, url, useragent, referer):
-    c = docker.Client(base_url='unix://var/run/docker.sock', version="1.7")
+    c = docker.Client(base_url='tcp://172.17.42.1:2375', version="1.7")
     image = "espenfjo/fjospidie:latest"
 
     fjospidie_cmd = "--debug --url '{}' --uuid '{}'".format(smart_str(url),uuid)
@@ -19,4 +19,4 @@ def job(uuid, url, useragent, referer):
     if settings.DATABASES['default']['PORT']:
         environment['MONGO_PORT'] = settings.DATABASES['default']['PORT']
     container = c.create_container(image, command=fjospidie_cmd, volumes={"/mnt/fjospidie":{}}, detach=True, environment=environment)
-    c.start(container, binds={'/mnt/fjospidie':'/mnt/fjospidie'}, lxc_conf=None)
+    c.start(container, binds={'/mnt/fjospidie':'/mnt/fjospidie', '/var/run/suricata/':'/var/run/suricata/'}, lxc_conf=None)