Removed ppa, unused certificate generation, updated readme

deployment_scripts/README.md

@@ -16,7 +16,7 @@ Don't forget to add python to PATH or do so while installing it via this script.
 You must have root permissions, but don't run the script as root.<br>
 Launch deploy_linux.sh from scripts directory.<br>
 First argument should be an empty directory (script can create one, default is ./infection_monkey) and second is the branch you want to clone (develop by default).
-Choose a directory where you have all the relevant permissions, for e.g. /home/your_username
+Choose a directory where you have all the relevant permissions and give it's absolute path, for e.g. /home/your_username
 Example usages:<br>
 ./deploy_linux.sh (deploys under ./infection_monkey)<br>
 ./deploy_linux.sh "/home/test/monkey" (deploys under /home/test/monkey)<br>

deployment_scripts/deploy_linux.sh

@@ -69,9 +69,8 @@ fi
 
 if [[ ${python_cmd} == "" ]]; then
   log_message "Python 3.7 command not found. Installing python 3.7."
-  sudo add-apt-repository ppa:deadsnakes/ppa
+  sudo apt-get update
-  sudo apt update
+  sudo apt-get install python3.7
-  sudo apt install python3.7
   log_message "Python 3.7 is now available with command 'python3.7'."
   python_cmd="python3.7"
 fi
@@ -119,13 +118,6 @@ sudo apt-get install openssl
 
 # Generate SSL certificate
 log_message "Generating certificate"
-cd ${ISLAND_PATH} || handle_error
-openssl genrsa -out cc/server.key 1024 || handle_error
-openssl req -new -key cc/server.key -out cc/server.csr \
--subj "/C=GB/ST=London/L=London/O=Global Security/OU=Monkey Department/CN=monkey.com" || handle_error
-openssl x509 -req -days 366 -in cc/server.csr -signkey cc/server.key -out cc/server.crt || handle_error
-
-
 sudo chmod +x ${ISLAND_PATH}/linux/create_certificate.sh || handle_error
 ${ISLAND_PATH}/linux/create_certificate.sh || handle_error
 
@@ -151,7 +143,7 @@ wget -c -N -P ${MONKEY_BIN_DIR} ${SAMBACRY_64_BINARY_URL}
 wget -c -N -P ${MONKEY_BIN_DIR} ${SAMBACRY_32_BINARY_URL}
 
 # Download traceroute binaries
-log_message "Downloading tracerout binaries"
+log_message "Downloading traceroute binaries"
 wget -c -N -P ${MONKEY_BIN_DIR} ${TRACEROUTE_64_BINARY_URL}
 wget -c -N -P ${MONKEY_BIN_DIR} ${TRACEROUTE_32_BINARY_URL}
 

monkey/monkey_island/linux/run.sh

@@ -12,5 +12,5 @@ if [[ `python3.7 --version 2>&1` == *"Python 3.7"* ]]; then
   python_cmd="python3.7"
 fi
 
-./bin/mongodb/bin/mongod --dbpath ./bin/mongodb/db
+./monkey_island/bin/mongodb/bin/mongod --dbpath ./monkey_island/bin/mongodb/db
-${python_cmd} monkey_island.py
+${python_cmd} ./monkey_island.py

monkey/monkey_island/readme.txt

@@ -22,7 +22,7 @@ How to set up the Monkey Island server:
 	OR
     3.b. Use already running instance of mongodb
 		3.b.1. Run 'set MONKEY_MONGO_URL="mongodb://<SERVER ADDR>:27017/monkeyisland"'. Replace '<SERVER ADDR>' with address of mongo server
-        
+
 4. Place portable version of OpenSSL
 	4.1. Download from: https://indy.fulgan.com/SSL/Archive/openssl-1.0.2l-i386-win32.zip
 	4.2. Extract content from bin folder to monkey_island\bin\openssl
@@ -56,7 +56,7 @@ How to run:
 2. Install the packages from monkey_island/requirements.txt:
 	sudo python -m pip install -r /var/monkey_island/requirements.txt
 	If pip is not installed, install the python-pip package. Make sure the server is running Python 2.7 and not Python 3+.
-	
+
 3. put monkey binaries in /var/monkey_island/cc/binaries
     monkey-linux-64 - monkey binary for linux 64bit
 	monkey-linux-32 - monkey binary for linux 32bit
@@ -81,11 +81,11 @@ How to run:
 
 8. Install npm
 	8.1. Download and install from: https://www.npmjs.com/get-npm
-	
+
 9. Build Monkey Island frontend
 	9.1. cd to 'monkey_island/cc/ui'
 	9.2. run 'npm update'
 	9.3. run 'npm run dist'
-	
+
 How to run:
-1. run run.sh (located under /linux)
+1. When your current working directory is monkey, run run.sh (located under /linux)