fix nits

docker/compose/mozdef_base/Dockerfile

@@ -25,8 +25,7 @@ RUN \
                     python-pip && \
   pip install virtualenv && \
   mkdir /opt/mozdef/envs/mozdef && \
-  mkdir /opt/mozdef/envs/mozdef/cron && \
-  yum install -y git
+  mkdir /opt/mozdef/envs/mozdef/cron
 
 # Create python virtual environment and install dependencies
 COPY requirements.txt /opt/mozdef/envs/mozdef/requirements.txt

mozdef_util/docs/installation.rst

@@ -32,20 +32,21 @@ You can either clone the public repository:
 
 .. code-block:: console
 
-    $ git clone git://github.com/jeffbryner/mozdef_util
+    $ git clone git://github.com/mozilla/mozdef
 
 Or download the `tarball`_:
 
 .. code-block:: console
 
-    $ curl  -OL https://github.com/jeffbryner/mozdef_util/tarball/master
+    $ curl  -OL https://github.com/mozilla/mozdef/tarball/master
 
 Once you have a copy of the source, you can install it with:
 
 .. code-block:: console
 
+    $ cd mozdef_util
     $ python setup.py install
 
 
-.. _Github repo: https://github.com/jeffbryner/mozdef_util
-.. _tarball: https://github.com/jeffbryner/mozdef_util/tarball/master
+.. _Github repo: https://github.com/mozilla/mozdef
+.. _tarball: https://github.com/mozilla/mozdef/tarball/master

mq/esworker_sqs.py

@@ -156,7 +156,7 @@ def esConnect():
 
 class taskConsumer(object):
 
-    def __init__(self, mqConnection, taskQueue, esConnection, options):
+    def __init__(self, mqConnection, taskQueue, esConnection):
         self.connection = mqConnection
         self.esConnection = esConnection
         self.taskQueue = taskQueue

requirements.txt

@@ -59,6 +59,3 @@ uritemplate==0.6
 urllib3==1.22
 uwsgi==2.0.17.1
 virtualenv==1.11.4
-moto==1.3.6
-WebTest==2.0.32
-freezegun==0.3.11