Merge pull request #41 from guardicore/bugfix/deb-package-conflict

Bugfix/deb package conflict

README.md

@@ -36,6 +36,8 @@ The Monkey itself has been tested on Windows XP, 7, 8.1 and 10. The Linux build
 
 ### Installation
 
+Warning! The Debian package will uninstall the python library 'bson' because of an issue with pymongo. You can reinstall it later, but monkey island will probably not work.
+
 For off-the-shelf use, download our Debian package from our website and follow the guide [written in our blog](https://www.guardicore.com/2016/07/infection-monkey-loose-2/). 
  To manually set up and the C&C server follow the instructions on [Monkey Island readme](monkey_island/readme.txt).  If you wish to compile the binaries yourself, follow the instructions under Building the Monkey from Source.  
  

monkey_island/deb-package/DEBIAN/postinst

@@ -6,9 +6,13 @@ INSTALLATION_FOLDER=/var/monkey_island/installation
 cp -f ${MONKEY_FOLDER}/monkey.sh /usr/bin/monkey
 chmod 755 /usr/bin/monkey
 
+# Fix dependency bug
+pip uninstall -y bson
+
 # install pip requirements
 pip install -r $MONKEY_FOLDER/pip_requirements.txt --no-index --find-links file://$INSTALLATION_FOLDER
 
+
 # remove installation folder and unnecessary files
 rm -rf ${INSTALLATION_FOLDER}
 rm -f ${MONKEY_FOLDER}/pip_requirements.txt

monkey_island/deb-package/monkey_island_pip_requirements.txt

@@ -5,7 +5,6 @@ jinja2
 markupsafe
 itsdangerous
 click
-bson
 flask
 Flask-Pymongo
 Flask-Restful

monkey_island/requirements.txt

@@ -5,7 +5,6 @@ jinja2
 markupsafe
 itsdangerous
 click
-bson
 flask
 Flask-Pymongo
 Flask-Restful