Merge branch 'pydat4-dev'

.gitignore

@@ -1,3 +1,4 @@
 pydat/pydat/custom_settings.py
 *.pyc
 *.swp
+*.vscode

Dockerfile

@@ -2,7 +2,7 @@ FROM httpd:2.4
 
 MAINTAINER mitrecnd, http://github.com/mitrecnd
 
-ENV WSGI_VERSION="4.4.13" PATH=$PATH:/opt/WhoDat/pydat/scripts
+ENV WSGI_VERSION="4.6.4" PATH=$PATH:/opt/WhoDat/pydat/scripts
 
 COPY . /opt/WhoDat/
 ADD https://bootstrap.pypa.io/get-pip.py /tmp/
@@ -21,7 +21,7 @@ RUN \
     apt-get install -y python python-dev $buildDeps && \
     /tmp/get-pip.py && \
     rm /tmp/get-pip.py && \
-    pip install -r /opt/WhoDat/docker/requirements.txt && \
+    pip install -r /opt/WhoDat/requirements.es5.txt && \
     cd /tmp/ && \
     tar -zxf ${WSGI_VERSION}.tar.gz && \
     rm ${WSGI_VERSION}.tar.gz && \

docker/README.md

@@ -43,9 +43,9 @@ Note that you will still need to create and pass in a custom_setings.py configur
 Image Organization
 ------------------
 
-This image is based on Apache's httpd image with all required dependencies to use pyDat with MongoDB or ElasticSearch. 
+This image is based on Apache's httpd image with all required dependencies to use pyDat with ElasticSearch.
 
-The repo has been installed into /opt/WhoDat but a soft link has been created at /pydat which points to /opt/WhoDat/pydat/pydat to make it easier to add a custom_settings file. 
+The repo has been installed into /opt/WhoDat but a soft link has been created at /pydat which points to /opt/WhoDat/pydat/pydat to make it easier to add a custom_settings file.
 
 The PATH has also been modified to include the scripts directory allowing you to directly execute the populate scripts from the command line:
 

docker/apache.config

@@ -22,6 +22,7 @@ LoadModule status_module modules/mod_status.so
 LoadModule autoindex_module modules/mod_autoindex.so
 LoadModule dir_module modules/mod_dir.so
 LoadModule alias_module modules/mod_alias.so
+LoadModule mpm_event_module modules/mod_mpm_event.so
 
 <IfModule unixd_module>
         User daemon
@@ -196,7 +197,7 @@ WSGIScriptAlias "/" "/opt/WhoDat/pydat/pydat/wsgi.py" process-group=pydat applic
     </Directory>
 
     # Static content - CSS, Javascript, images, etc.
-    Alias /static/ /opt/WhoDat/pydat/pydat/static/
+    Alias /static/ /opt/WhoDat/pydat/extras/www/static/
     <Directory /opt/WhoDat/pydat/extras/www/static>
         Order allow,deny
         Allow from all