From d187e8d234678f386e4204386cc3ff1d64c5ccee Mon Sep 17 00:00:00 2001 From: Daniel Goldberg Date: Sun, 23 Feb 2020 10:31:56 +0200 Subject: [PATCH 1/2] Remove assumption on virtualenv being on path --- monkey/monkey_island/deb-package/DEBIAN/postinst | 2 +- monkey/monkey_island/deb-package/DEBIAN_MONGO/postinst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/monkey/monkey_island/deb-package/DEBIAN/postinst b/monkey/monkey_island/deb-package/DEBIAN/postinst index 93053a76e..bb09d9193 100644 --- a/monkey/monkey_island/deb-package/DEBIAN/postinst +++ b/monkey/monkey_island/deb-package/DEBIAN/postinst @@ -6,7 +6,7 @@ PYTHON_FOLDER=/var/monkey/monkey_island/bin/python # Prepare python virtualenv pip3 install virtualenv --no-index --find-links file://$INSTALLATION_FOLDER -virtualenv -p python3 ${PYTHON_FOLDER} +python3 -m virtualenv -p python3 ${PYTHON_FOLDER} # install pip requirements ${PYTHON_FOLDER}/bin/python -m pip install -r $MONKEY_FOLDER/monkey_island/requirements.txt --no-index --find-links file://$INSTALLATION_FOLDER diff --git a/monkey/monkey_island/deb-package/DEBIAN_MONGO/postinst b/monkey/monkey_island/deb-package/DEBIAN_MONGO/postinst index 42dc2d5a2..1ad12a7e2 100644 --- a/monkey/monkey_island/deb-package/DEBIAN_MONGO/postinst +++ b/monkey/monkey_island/deb-package/DEBIAN_MONGO/postinst @@ -6,7 +6,7 @@ PYTHON_FOLDER=/var/monkey/monkey_island/bin/python # Prepare python virtualenv pip3 install virtualenv --no-index --find-links file://$INSTALLATION_FOLDER -virtualenv -p python3 ${PYTHON_FOLDER} +python3 -m virtualenv -p python3 ${PYTHON_FOLDER} # install pip requirements ${PYTHON_FOLDER}/bin/python -m pip install -r $MONKEY_FOLDER/monkey_island/requirements.txt --no-index --find-links file://$INSTALLATION_FOLDER From e66dc6bad16043e27e2439c3c599d41fc76ca50f Mon Sep 17 00:00:00 2001 From: Daniel Goldberg Date: Sun, 23 Feb 2020 10:32:07 +0200 Subject: [PATCH 2/2] Hardcode Kali mongo installation. --- monkey/monkey_island/linux/install_mongo.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/monkey/monkey_island/linux/install_mongo.sh b/monkey/monkey_island/linux/install_mongo.sh index df2c0160e..f9e72928d 100755 --- a/monkey/monkey_island/linux/install_mongo.sh +++ b/monkey/monkey_island/linux/install_mongo.sh @@ -23,6 +23,9 @@ elif [[ ${os_version_monkey} == "Debian GNU/Linux 9"* ]]; then elif [[ ${os_version_monkey} == "Debian GNU/Linux 10"* ]]; then echo Detected Debian 10 export tgz_url="https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-debian10-4.2.3.tgz" +elif [[ ${os_version_monkey} == "Kali GNU/Linux"* ]]; then + echo Detected Kali Linux + export tgz_url="https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-debian10-4.2.3.tgz" else echo Unsupported OS exit 1