From c1118a54c0e8890b4815ead91718b4029606671b Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Fri, 22 Jan 2021 10:36:53 -0500
Subject: [PATCH 01/36] Update azure.md
---
docs/content/setup/azure.md | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/content/setup/azure.md b/docs/content/setup/azure.md
index a4a2eda84..5ad41aa2e 100644
--- a/docs/content/setup/azure.md
+++ b/docs/content/setup/azure.md
@@ -9,16 +9,16 @@ tags: ["setup", "azure"]
## Deployment
-Select [Infection Monkey from the Azure Marketplace](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/guardicore.infection_monkey) and click **GET IT NOW**.
+Select the [Infection Monkey from the Azure Marketplace](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/guardicore.infection_monkey) and click **GET IT NOW**.
1. Under **Basics**:
- 1. Choose a name for your Infection Monkey instance, such as InfectionMonkey.
- 1. Choose a username and password or provide a SSH public key for authentication.
- 1. Choose a resource group and the location your instance will be deployed in.
+ 1. Choose a name for the Infection Monkey instance, such as InfectionMonkey.
+ 1. Choose a username and password or provide an SSH public key for authentication.
+ 1. Choose a resource group and the location for your instance.
1. Under **Size**
1. Choose a machine size with at least 1GB of RAM for optimal performance.
1. Under **Settings**
- 1. Choose the network the new instance will be a member of.
+ 1. Choose the network for your new instance.
1. In the **Network Security Group** field, make sure ports 5000 and 5001 on the machine are accessible for inbound TCP traffic.
1. Under **Summary**
1. Review the details of the offer and click **Create**.
@@ -29,6 +29,6 @@ At this point, Azure will instance and deploy your new machine. When ready, you
## Upgrading
-Currently there's no "upgrade-in-place" option when a new version comes out. To get the new version, you can deploy a new machine from the marketplace. If you'd like to keep your existing configuration, you can export it to a file by using the Export button and then import it to the new Monkey Island.
+Currently, there's no "upgrade-in-place" option when a new version is released. To get the updated version, you can deploy a new machine from the marketplace. If you'd like to keep your existing configuration, you can export it to a file using the export button and then import it to the new Monkey Island.
From 45ed91327ddc3a9ee56edbc22ce04fc643cd9de2 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Fri, 22 Jan 2021 10:55:03 -0500
Subject: [PATCH 02/36] Update debian.md
---
docs/content/setup/debian.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/content/setup/debian.md b/docs/content/setup/debian.md
index a1d751411..2dd04c1f8 100644
--- a/docs/content/setup/debian.md
+++ b/docs/content/setup/debian.md
@@ -19,7 +19,7 @@ sudo apt update
sudo dpkg -i monkey_island.deb # this might print errors
```
-If at this point, dpkg printed errors that look like this:
+If, at this point, you receive dpkg printed errors that look like this:
```sh
dpkg: error processing package gc-monkey-island (--install):
@@ -28,7 +28,7 @@ Errors were encountered while processing:
gc-monkey-island
```
-That just means that not all dependencies were pre-installed on your system. That’s no problem! Just run the following command, which will install all dependencies and then install the Monkey Island:
+It just means that not all dependencies were pre-installed on your system. That’s no problem! Just run the following command, which will install all dependencies, and then install the Monkey Island:
```sh
sudo apt install -f
@@ -38,7 +38,7 @@ sudo apt install -f
### Trying to install on Ubuntu <16.04
-If you’re trying to install the Monkey Island on Ubuntu 16.04 or older, you need to install the dependencies yourself, since Python 3.7 is only installable from the `deadsnakes` PPA. To install the Monkey Island on Ubuntu 16.04, follow the following steps:
+If you’re trying to install the Monkey Island on Ubuntu 16.04 or older, you need to install the dependencies yourself, since Python 3.7 is only installable from the `deadsnakes` PPA. To install the Monkey Island on Ubuntu 16.04, follow these steps:
```sh
sudo apt update
@@ -59,6 +59,6 @@ To check the status of the Monkey Island after the installation, run the followi
To upgrade when a new version comes out, download the new Monkey `.deb` file and install it. You should see a message like `Unpacking monkey-island (1.8.2) over (1.8.0)`. After which, the installation should complete successfully.
-If you'd like to keep your existing configuration, you can export it to a file by using the Export button and then import it to the new server.
+If you'd like to keep your existing configuration, you can export it to a file using the export button and then import it to the new server.
From 0cbe23846515eecd75e4034bf84f0dc030f12410 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Fri, 22 Jan 2021 10:57:28 -0500
Subject: [PATCH 03/36] Update docker.md
---
docs/content/setup/docker.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/content/setup/docker.md b/docs/content/setup/docker.md
index 4a07293b8..ba613d57b 100644
--- a/docs/content/setup/docker.md
+++ b/docs/content/setup/docker.md
@@ -25,6 +25,6 @@ sudo docker run --name monkey-island --network=host -d guardicore/monkey-island:
There's no "upgrade-in-place" option for Docker. To get the new version, download it, stop the current container, and run the installation commands again with the new file.
-If you'd like to keep your existing configuration, you can export it to a file by using the Export button and then import it to the new server.
+If you'd like to keep your existing configuration, you can export it to a file by using the export button and then import it to the new server.
From 4737dc9b76558d593ab0f96f4684e33df06ab15d Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Fri, 22 Jan 2021 11:15:58 -0500
Subject: [PATCH 04/36] Update vmware.md
---
docs/content/setup/vmware.md | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/docs/content/setup/vmware.md b/docs/content/setup/vmware.md
index 5ee958188..019884f13 100644
--- a/docs/content/setup/vmware.md
+++ b/docs/content/setup/vmware.md
@@ -9,22 +9,19 @@ tags: ["setup", "vmware"]
## Deployment
-1. Deploy the Infection Monkey OVA by choosing Deploy OVF Template and follow the wizard instructions. *Note: make sure port 5000 and 5001 on the machine are accessible for inbound TCP traffic.*
+1. Deploy the Infection Monkey OVA by choosing **Deploy OVF Template** and following the wizard instructions. *Note: make sure ports 5000 and 5001 on the machine are accessible for inbound TCP traffic.*
2. Turn on the Infection Monkey VM.
3. Log in to the machine with the following credentials:
1. Username: **monkeyuser**
2. Password: **Noon.Earth.Always**
-4. It's recommended to change the machine passwords by running the following commands: `sudo passwd monkeyuser`, `sudo passwd root`.
+4. It's recommended you change the machine passwords by running the following commands: `sudo passwd monkeyuser`, `sudo passwd root`.
## OVA network modes
-The OVA can be used in one of two modes:
+You can use the OVA in one of two modes:
-1. In a network with DHCP configured. In this case, the Monkey Island will automatically query and receive an IP address from the network.
-1. With a static IP address.
-
- In this case, you should login to the VM console with
-username `root` and password `G3aJ9szrvkxTmfAG`. After logging in, edit the interfaces file. You can do that by writing the following command in the prompt:
+1. In a network with the DHCP configured— In this case, the Monkey Island will automatically query and receive an IP address from the network.
+2. With a static IP address — For this case, you should login to the VM console with the username `root` and the password `G3aJ9szrvkxTmfAG`. After logging in, edit the interfaces file by writing the following command in the prompt:
```sh
sudo nano /etc/network/interfaces
@@ -47,7 +44,7 @@ username `root` and password `G3aJ9szrvkxTmfAG`. After logging in, edit the inte
gateway YYY.YYY.YYY.YYY
```
- Save the changes then run the command
+ Save the changes then run the command:
```sh
sudo ifdown ens160 && ifup ens160
@@ -55,8 +52,6 @@ username `root` and password `G3aJ9szrvkxTmfAG`. After logging in, edit the inte
## Upgrading
-There's no "upgrade-in-place" option for Docker. To get the new version, download it, stop the current container, and run the installation commands again with the new file.
-
-If you'd like to keep your existing configuration, you can export it to a file by using the Export button and then import it to the new server.
+There's no "upgrade-in-place" option for VMware. To get the new version, download the updated file. If you'd like to keep your existing configuration, you can export it to a file by using the Export button and then import it to the new server.
From 4d5a07a6259ccbe29410c6c071e504d0977d7870 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Fri, 22 Jan 2021 11:19:53 -0500
Subject: [PATCH 05/36] Update vmware.md
Copyedits -
Note: The upgrade instructions were for Docker in original, please confirm VMware update steps. Thanks!
---
docs/content/setup/vmware.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/content/setup/vmware.md b/docs/content/setup/vmware.md
index 019884f13..d39b9b06f 100644
--- a/docs/content/setup/vmware.md
+++ b/docs/content/setup/vmware.md
@@ -27,7 +27,7 @@ You can use the OVA in one of two modes:
sudo nano /etc/network/interfaces
```
- And change the lines:
+ Change the lines:
```sh
auto ens160
From 9e2f13e208edcf34b55baf4908e98def0ad1d760 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Fri, 22 Jan 2021 11:50:51 -0500
Subject: [PATCH 06/36] Update windows.md
---
docs/content/setup/windows.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/content/setup/windows.md b/docs/content/setup/windows.md
index d8a6c84e9..1b008bd9d 100644
--- a/docs/content/setup/windows.md
+++ b/docs/content/setup/windows.md
@@ -9,27 +9,27 @@ tags: ["setup", "windows"]
## Deployment
-Run the installer, and you should be met with the following screen:
+After running the installer, the following prompt should appear on the screen:
-1. Follow the steps of the installation.
+1. Follow the steps to complete the installation.
1. Run the Monkey Island by clicking on the desktop shortcut.
## Troubleshooting
-### Missing windows update
+### Missing Windows update
-The installer requires [Windows update #2999226](https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows) to be installed. If you’re having trouble running the installer, please make sure to install that update via Windows Update or manually from the link.
+The installer requires [Windows update #2999226](https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows). If you’re having trouble running the installer, please make sure to install the update via Windows Update or manually from the link above.
### Supported browsers
-The Monkey Island supports Chrome (and Chrome-based) browsers. Some Windows Servers only have Internet Explorer installed. Make sure to use Chrome or a similar modern browser. [You can download Google Chrome from here](https://www.google.com/chrome/).
+The Monkey Island supports Chrome (and Chrome-based) browsers. Some Windows Servers only have Internet Explorer installed, so make sure you're using Chrome or a similar modern browser. [You can download Google Chrome here](https://www.google.com/chrome/).
## Upgrading
-To upgrade, download the new installer and run it. The new Monkey version should be installed over the old one.
+To upgrade the Infection Monkey on Windows, download the new installer and run it. The new Monkey version will install over the old one.
-If you'd like to keep your existing configuration, you can export it to a file by using the Export button and then import it to the new server.
+If you'd like to keep your existing configuration, you can export it to a file using the export button and then import it to the new server.
From 61808ae8c05585896d4291ef5a4047ba58653580 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 13:13:40 -0500
Subject: [PATCH 07/36] Update azure.md
---
docs/content/setup/azure.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/content/setup/azure.md b/docs/content/setup/azure.md
index 5ad41aa2e..d31a62047 100644
--- a/docs/content/setup/azure.md
+++ b/docs/content/setup/azure.md
@@ -14,7 +14,7 @@ Select the [Infection Monkey from the Azure Marketplace](https://azuremarketplac
1. Under **Basics**:
1. Choose a name for the Infection Monkey instance, such as InfectionMonkey.
1. Choose a username and password or provide an SSH public key for authentication.
- 1. Choose a resource group and the location for your instance.
+ 1. Choose a resource group and the location for the Infection Monkey instance.
1. Under **Size**
1. Choose a machine size with at least 1GB of RAM for optimal performance.
1. Under **Settings**
@@ -29,6 +29,6 @@ At this point, Azure will instance and deploy your new machine. When ready, you
## Upgrading
-Currently, there's no "upgrade-in-place" option when a new version is released. To get the updated version, you can deploy a new machine from the marketplace. If you'd like to keep your existing configuration, you can export it to a file using the export button and then import it to the new Monkey Island.
+Currently, there's no "upgrade-in-place" option when a new version is released. To get the updated version, you can deploy a new machine from the marketplace. If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
From 4e9d794b0ee41ba5307a055317282f66cc1288b7 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 13:17:59 -0500
Subject: [PATCH 08/36] Update windows.md
---
docs/content/setup/windows.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/content/setup/windows.md b/docs/content/setup/windows.md
index 1b008bd9d..b24c913fa 100644
--- a/docs/content/setup/windows.md
+++ b/docs/content/setup/windows.md
@@ -24,7 +24,7 @@ The installer requires [Windows update #2999226](https://support.microsoft.com/e
### Supported browsers
-The Monkey Island supports Chrome (and Chrome-based) browsers. Some Windows Servers only have Internet Explorer installed, so make sure you're using Chrome or a similar modern browser. [You can download Google Chrome here](https://www.google.com/chrome/).
+The Monkey Island supports Chrome (and Chrome-based) browsers. If your Windows server only has Internet Explorer installed, please install Chrome or a similar modern browser. [You can download Google Chrome here](https://www.google.com/chrome/).
## Upgrading
From c239f03615ebd7fe99b0a2e1dfa50de72141ef31 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 13:20:47 -0500
Subject: [PATCH 09/36] Update windows.md
---
docs/content/setup/windows.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/content/setup/windows.md b/docs/content/setup/windows.md
index b24c913fa..514b999f8 100644
--- a/docs/content/setup/windows.md
+++ b/docs/content/setup/windows.md
@@ -28,8 +28,8 @@ The Monkey Island supports Chrome (and Chrome-based) browsers. If your Windows s
## Upgrading
-To upgrade the Infection Monkey on Windows, download the new installer and run it. The new Monkey version will install over the old one.
+To upgrade the Infection Monkey on Windows, download the new installer and run it. The new Monkey version will be installed over the old version.
-If you'd like to keep your existing configuration, you can export it to a file using the export button and then import it to the new server.
+If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new server.
From 5f64921499ab36d9f0a02533884c38d5708c681e Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 13:23:20 -0500
Subject: [PATCH 10/36] Update vmware.md
---
docs/content/setup/vmware.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/content/setup/vmware.md b/docs/content/setup/vmware.md
index d39b9b06f..20557561d 100644
--- a/docs/content/setup/vmware.md
+++ b/docs/content/setup/vmware.md
@@ -10,18 +10,18 @@ tags: ["setup", "vmware"]
## Deployment
1. Deploy the Infection Monkey OVA by choosing **Deploy OVF Template** and following the wizard instructions. *Note: make sure ports 5000 and 5001 on the machine are accessible for inbound TCP traffic.*
-2. Turn on the Infection Monkey VM.
-3. Log in to the machine with the following credentials:
+1. Turn on the Infection Monkey VM.
+1. Log in to the machine with the following credentials:
1. Username: **monkeyuser**
- 2. Password: **Noon.Earth.Always**
-4. It's recommended you change the machine passwords by running the following commands: `sudo passwd monkeyuser`, `sudo passwd root`.
+ 1. Password: **Noon.Earth.Always**
+1. It's recommended you change the machine passwords by running the following commands: `sudo passwd monkeyuser`, `sudo passwd root`.
## OVA network modes
You can use the OVA in one of two modes:
1. In a network with the DHCP configured— In this case, the Monkey Island will automatically query and receive an IP address from the network.
-2. With a static IP address — For this case, you should login to the VM console with the username `root` and the password `G3aJ9szrvkxTmfAG`. After logging in, edit the interfaces file by writing the following command in the prompt:
+1. With a static IP address — For this case, you should login to the VM console with the username `root` and the password `G3aJ9szrvkxTmfAG`. After logging in, edit the interfaces file by writing the following command in the prompt:
```sh
sudo nano /etc/network/interfaces
From 6950ef2e6b893f199b824c3e1936357fd1f7e4ee Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 13:24:51 -0500
Subject: [PATCH 11/36] Update vmware.md
---
docs/content/setup/vmware.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/content/setup/vmware.md b/docs/content/setup/vmware.md
index 20557561d..a92fcad94 100644
--- a/docs/content/setup/vmware.md
+++ b/docs/content/setup/vmware.md
@@ -52,6 +52,6 @@ You can use the OVA in one of two modes:
## Upgrading
-There's no "upgrade-in-place" option for VMware. To get the new version, download the updated file. If you'd like to keep your existing configuration, you can export it to a file by using the Export button and then import it to the new server.
+There's no "upgrade-in-place" option for VMware. To get the new version, download the updated OVA file. If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
From 5824b11657f68ae14415222ede5d506a09b2be50 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 13:34:43 -0500
Subject: [PATCH 12/36] Update vmware.md
---
docs/content/setup/vmware.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/content/setup/vmware.md b/docs/content/setup/vmware.md
index a92fcad94..11c0ab092 100644
--- a/docs/content/setup/vmware.md
+++ b/docs/content/setup/vmware.md
@@ -20,8 +20,8 @@ tags: ["setup", "vmware"]
You can use the OVA in one of two modes:
-1. In a network with the DHCP configured— In this case, the Monkey Island will automatically query and receive an IP address from the network.
-1. With a static IP address — For this case, you should login to the VM console with the username `root` and the password `G3aJ9szrvkxTmfAG`. After logging in, edit the interfaces file by writing the following command in the prompt:
+1. In a network with the DHCP configured — In this case, the Monkey Island will automatically query and receive an IP address from the network.
+1. With a static IP address — In this case, you should log in to the VM console with the username `root` and the password `G3aJ9szrvkxTmfAG`. After logging in, edit the interfaces file by writing the following command in the prompt:
```sh
sudo nano /etc/network/interfaces
@@ -52,6 +52,6 @@ You can use the OVA in one of two modes:
## Upgrading
-There's no "upgrade-in-place" option for VMware. To get the new version, download the updated OVA file. If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
+Currently, there's no "upgrade-in-place" option when a new version is released. To get an updated version, download the updated OVA file. If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
From d50f43e43e4b1d952dd916e67c20f63f900eb895 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 14:01:05 -0500
Subject: [PATCH 13/36] Update debian.md
---
docs/content/setup/debian.md | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/docs/content/setup/debian.md b/docs/content/setup/debian.md
index 2dd04c1f8..d94785dc8 100644
--- a/docs/content/setup/debian.md
+++ b/docs/content/setup/debian.md
@@ -8,6 +8,16 @@ disableToc: false
tags: ["setup", "debian", "linux"]
---
+---
+title: "Debian"
+date: 2020-05-26T20:57:19+03:00
+draft: false
+pre: ' '
+weight: 1
+disableToc: false
+tags: ["setup", "debian", "linux"]
+---
+
## Deployment
To extract the `tar.gz` file, run `tar -xvzf monkey-island-debian.tar.gz`.
@@ -57,8 +67,9 @@ To check the status of the Monkey Island after the installation, run the followi
## Upgrading
-To upgrade when a new version comes out, download the new Monkey `.deb` file and install it. You should see a message like `Unpacking monkey-island (1.8.2) over (1.8.0)`. After which, the installation should complete successfully.
+Currently, there's no "upgrade-in-place" option when a new version is released. To get the updated version, download the new `.deb` file and install it. You should see a message like `Unpacking monkey-island (1.8.2) over (1.8.0)`. After which, the installation should complete successfully.
-If you'd like to keep your existing configuration, you can export it to a file using the export button and then import it to the new server.
+If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
+
From 7d58b873c9dafd6c299de909573cfde063a9f1e3 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 14:10:13 -0500
Subject: [PATCH 14/36] Update docker.md
---
docs/content/setup/docker.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/content/setup/docker.md b/docs/content/setup/docker.md
index ba613d57b..15e62ced2 100644
--- a/docs/content/setup/docker.md
+++ b/docs/content/setup/docker.md
@@ -23,8 +23,8 @@ sudo docker run --name monkey-island --network=host -d guardicore/monkey-island:
## Upgrading
-There's no "upgrade-in-place" option for Docker. To get the new version, download it, stop the current container, and run the installation commands again with the new file.
+Currently, there's no "upgrade-in-place" option when a new version is released. To get an updated version, download it, stop the current container and run the installation commands again with the new file.
-If you'd like to keep your existing configuration, you can export it to a file by using the export button and then import it to the new server.
+If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
From 7c191a785f82ad6de4fecd94e698af9b1ec747b6 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Fri, 22 Jan 2021 08:41:51 -0500
Subject: [PATCH 15/36] Update _index.md
copyediting
---
docs/content/setup/_index.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/content/setup/_index.md b/docs/content/setup/_index.md
index bc114f2e4..4afb141d1 100644
--- a/docs/content/setup/_index.md
+++ b/docs/content/setup/_index.md
@@ -9,18 +9,18 @@ tags = ["setup"]
# Setting up Infection Monkey
-Setting up Infection Monkey is really easy! First, you need to {{% button href="https://infectionmonkey.com/" icon="fas fa-download" %}}download the Infection Monkey from our site{{% /button %}}.
+Setting up the Infection Monkey is easy! First, you need to: {{% button href="https://infectionmonkey.com/" icon="fas fa-download" %}}Download the Infection Monkey{{% /button %}}.
-Once you've downloaded an installer, you can follow the relevant guide for your environment:
+Once you've downloaded an installer, follow the relevant guide for your environment:
{{% children %}}
-Once you're done setting the Monkey up, check out our [Getting Started](../usage/getting-started) guide!
+After setting the Monkey up, check out our [Getting Started](../usage/getting-started) guide!
{{% notice tip %}}
You can find information about [operating system compatibility and support here](../reference/operating_systems_support).
{{% /notice %}}
{{% notice tip %}}
-You can find the binary checksums of our installers to verify their integrity [in this page](../usage/file-checksums).
-{{% /notice %}}
\ No newline at end of file
+You can find the binary checksums of our installers to verify their integrity [on this page](../usage/file-checksums).
+{{% /notice %}}
From e154bb9a0f3f671270d9906241f8158f03655d4e Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 12:36:58 -0500
Subject: [PATCH 16/36] Update _index.md
---
docs/content/setup/_index.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/content/setup/_index.md b/docs/content/setup/_index.md
index 4afb141d1..0e5d38690 100644
--- a/docs/content/setup/_index.md
+++ b/docs/content/setup/_index.md
@@ -9,7 +9,7 @@ tags = ["setup"]
# Setting up Infection Monkey
-Setting up the Infection Monkey is easy! First, you need to: {{% button href="https://infectionmonkey.com/" icon="fas fa-download" %}}Download the Infection Monkey{{% /button %}}.
+Setting up the Infection Monkey is easy! First, you need to {{% button href="https://infectionmonkey.com/" icon="fas fa-download" %}}Download the Infection Monkey{{% /button %}}.
Once you've downloaded an installer, follow the relevant guide for your environment:
From e556959a045ca7e348dc9a4ee975bd1ab93bf778 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Fri, 22 Jan 2021 08:55:24 -0500
Subject: [PATCH 17/36] Update accounts-and-security.md
copyediting
---
docs/content/setup/accounts-and-security.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/content/setup/accounts-and-security.md b/docs/content/setup/accounts-and-security.md
index 574b07c3c..2e12f1d49 100644
--- a/docs/content/setup/accounts-and-security.md
+++ b/docs/content/setup/accounts-and-security.md
@@ -7,15 +7,15 @@ pre: " "
tags: ["usage", "password"]
---
-## Security in Infection Monkey
+## Security in the Infection Monkey
-The first time you launch Monkey Island (Infection Monkey CC server), you'll be prompted to create an account and secure your island. After your account is created, the server will only be accessible via the credentials you chose.
+The first time you launch Monkey Island (the Infection Monkey CC server), you'll be prompted to create an account and secure your island. After account creation, the server will only be accessible via the credentials you entered.
-If you want island to be accessible without credentials press *I want anyone to access the island*. Please note that this option is insecure: you should only pick this for use in development environments.
+If you want an island to be accessible without credentials, press *I want anyone to access the island*. Please note that this option is insecure, and you should only use it in development environments.
-## Resetting account credentials
+## Resetting your account credentials
-To reset credentials edit `monkey_island\cc\server_config.json` by deleting `user` and `password_hash` variables. Then restart the Monkey Island server and you should be prompted with registration form again.
+To reset your credentials, edit `monkey_island\cc\server_config.json` by deleting the `user` and `password_hash` variables. Then restart the Monkey Island server, and you should be prompted with a registration form again.
Example `server_config.json` for account reset:
From fb02ae436de3586d9f141ae81e7f4c3e9da85084 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 12:42:11 -0500
Subject: [PATCH 18/36] Update accounts-and-security.md
---
docs/content/setup/accounts-and-security.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/docs/content/setup/accounts-and-security.md b/docs/content/setup/accounts-and-security.md
index 2e12f1d49..7f15a34c5 100644
--- a/docs/content/setup/accounts-and-security.md
+++ b/docs/content/setup/accounts-and-security.md
@@ -15,7 +15,9 @@ If you want an island to be accessible without credentials, press *I want anyone
## Resetting your account credentials
-To reset your credentials, edit `monkey_island\cc\server_config.json` by deleting the `user` and `password_hash` variables. Then restart the Monkey Island server, and you should be prompted with a registration form again.
+To reset your credentials, edit `monkey_island\cc\server_config.json` by deleting the `user` and `password_hash` variables.
+
+When you restart the Monkey Island server, you will again be prompted with the registration form.
Example `server_config.json` for account reset:
From 5c2e3ab64bde3afc23cb9ca6c2fcf14dd7a0cd7d Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Fri, 22 Jan 2021 10:14:31 -0500
Subject: [PATCH 19/36] Update aws.md
copyedits
---
docs/content/setup/aws.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/content/setup/aws.md b/docs/content/setup/aws.md
index bcbfaeb75..2a93ed921 100644
--- a/docs/content/setup/aws.md
+++ b/docs/content/setup/aws.md
@@ -12,19 +12,19 @@ tags: ["setup", "aws"]
On the [Infection Monkey’s AWS Marketplace page](https://aws.amazon.com/marketplace/pp/GuardiCore-Infection-Monkey/B07B3J7K6D), click **Continue to Subscribe**.
1. Choose the desired region.
-1. Choose an EC2 instance type with at least 1GB of RAM for optimal performance or stick with the recommended.
-1. Select the VPC and subnet you want the instance to be in.
+1. Choose an EC2 instance type with at least 1GB of RAM for optimal performance or stick with the default reccomendation.
+1. Select the VPC and subnet you want to use for your instance.
1. In the Security Group section, make sure ports 5000 and 5001 on the machine are accessible for inbound TCP traffic.
1. Choose an existing EC2 key pair for authenticating with your new instance.
1. Click **Launch with 1-click.**
At this point, AWS will instance and deploy your new machine.
-When ready, you can browse to the Infection Monkey running on your fresh deployment at:
+When ready, you can browse to the Infection Monkey running on your fresh deployment at:
`https://{public-ip}:5000`
-You will be presented a login page. Use the username **monkey**, and the new EC2 instace’s instance ID for password. You can find the instance id by going to the EC2 console and selecting your instance. It should appear in the details pane below.
+You will be presented with a login page. Enter the username **monkey**, and the new EC2 instance's **instance ID** for your password. To find your instance ID, go to the EC2 console and select your instance. It should appear in the details pane below.
@@ -34,6 +34,6 @@ The Monkey has built-in integrations with AWS services for better execution and
## Upgrading
-Currently there's no "upgrade-in-place" option when a new version comes out. To get the new version, you can deploy a new machine from the marketplace. If you'd like to keep your existing configuration, you can export it to a file by using the Export button and then import it to the new Monkey Island.
+Currently, there's no "upgrade-in-place" option when a new version comes out. To get an updated version, you can deploy a new machine from the marketplace. If you'd like to keep your existing configuration, you can export it to a file using the export button and then import it to the new Monkey Island.
From b16cf5ae8d30c5c88da64188507b5b21013c6e77 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 12:56:36 -0500
Subject: [PATCH 20/36] Update aws.md
---
docs/content/setup/aws.md | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/docs/content/setup/aws.md b/docs/content/setup/aws.md
index 2a93ed921..eaa364cc8 100644
--- a/docs/content/setup/aws.md
+++ b/docs/content/setup/aws.md
@@ -12,7 +12,7 @@ tags: ["setup", "aws"]
On the [Infection Monkey’s AWS Marketplace page](https://aws.amazon.com/marketplace/pp/GuardiCore-Infection-Monkey/B07B3J7K6D), click **Continue to Subscribe**.
1. Choose the desired region.
-1. Choose an EC2 instance type with at least 1GB of RAM for optimal performance or stick with the default reccomendation.
+1. Choose an EC2 instance type with at least 1GB of RAM for optimal performance or stick with the default recommendation.
1. Select the VPC and subnet you want to use for your instance.
1. In the Security Group section, make sure ports 5000 and 5001 on the machine are accessible for inbound TCP traffic.
1. Choose an existing EC2 key pair for authenticating with your new instance.
@@ -30,10 +30,11 @@ You will be presented with a login page. Enter the username **monkey**, and the
## Integration with AWS services
-The Monkey has built-in integrations with AWS services for better execution and reporting. See [Usage -> Integrations](../../usage/integrations) for more details.
+The Infection Monkey has built-in integrations with AWS services for better execution and reporting. See [Usage -> Integrations](../../usage/integrations) for more details.
## Upgrading
-Currently, there's no "upgrade-in-place" option when a new version comes out. To get an updated version, you can deploy a new machine from the marketplace. If you'd like to keep your existing configuration, you can export it to a file using the export button and then import it to the new Monkey Island.
+
+Currently, there's no "upgrade-in-place" option when a new version is released. To get an updated version, you can deploy a new machine from the marketplace. If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
From 9a0785bdc51f15feaa45f35b389bb4b6b50829ae Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Fri, 22 Jan 2021 13:05:31 -0500
Subject: [PATCH 21/36] Update debian.md
Copyediting
---
docs/content/setup/debian.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/content/setup/debian.md b/docs/content/setup/debian.md
index a1d751411..2dd04c1f8 100644
--- a/docs/content/setup/debian.md
+++ b/docs/content/setup/debian.md
@@ -19,7 +19,7 @@ sudo apt update
sudo dpkg -i monkey_island.deb # this might print errors
```
-If at this point, dpkg printed errors that look like this:
+If, at this point, you receive dpkg printed errors that look like this:
```sh
dpkg: error processing package gc-monkey-island (--install):
@@ -28,7 +28,7 @@ Errors were encountered while processing:
gc-monkey-island
```
-That just means that not all dependencies were pre-installed on your system. That’s no problem! Just run the following command, which will install all dependencies and then install the Monkey Island:
+It just means that not all dependencies were pre-installed on your system. That’s no problem! Just run the following command, which will install all dependencies, and then install the Monkey Island:
```sh
sudo apt install -f
@@ -38,7 +38,7 @@ sudo apt install -f
### Trying to install on Ubuntu <16.04
-If you’re trying to install the Monkey Island on Ubuntu 16.04 or older, you need to install the dependencies yourself, since Python 3.7 is only installable from the `deadsnakes` PPA. To install the Monkey Island on Ubuntu 16.04, follow the following steps:
+If you’re trying to install the Monkey Island on Ubuntu 16.04 or older, you need to install the dependencies yourself, since Python 3.7 is only installable from the `deadsnakes` PPA. To install the Monkey Island on Ubuntu 16.04, follow these steps:
```sh
sudo apt update
@@ -59,6 +59,6 @@ To check the status of the Monkey Island after the installation, run the followi
To upgrade when a new version comes out, download the new Monkey `.deb` file and install it. You should see a message like `Unpacking monkey-island (1.8.2) over (1.8.0)`. After which, the installation should complete successfully.
-If you'd like to keep your existing configuration, you can export it to a file by using the Export button and then import it to the new server.
+If you'd like to keep your existing configuration, you can export it to a file using the export button and then import it to the new server.
From 6a944b0fbed0816475c433b9ed5ad2b6f5ebe79c Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 13:59:37 -0500
Subject: [PATCH 22/36] Update debian.md
---
docs/content/setup/debian.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/content/setup/debian.md b/docs/content/setup/debian.md
index 2dd04c1f8..118ed05e0 100644
--- a/docs/content/setup/debian.md
+++ b/docs/content/setup/debian.md
@@ -57,8 +57,8 @@ To check the status of the Monkey Island after the installation, run the followi
## Upgrading
-To upgrade when a new version comes out, download the new Monkey `.deb` file and install it. You should see a message like `Unpacking monkey-island (1.8.2) over (1.8.0)`. After which, the installation should complete successfully.
+Currently, there's no "upgrade-in-place" option when a new version is released. To get the updated version, download the new `.deb` file and install it. You should see a message like `Unpacking monkey-island (1.8.2) over (1.8.0)`. After which, the installation should complete successfully.
-If you'd like to keep your existing configuration, you can export it to a file using the export button and then import it to the new server.
+If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
From 5eb96e34b3108df75a8027ec64ff5053c78453c4 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Fri, 22 Jan 2021 13:07:43 -0500
Subject: [PATCH 23/36] Update docker.md
copyediting
---
docs/content/setup/docker.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/content/setup/docker.md b/docs/content/setup/docker.md
index 4a07293b8..ba613d57b 100644
--- a/docs/content/setup/docker.md
+++ b/docs/content/setup/docker.md
@@ -25,6 +25,6 @@ sudo docker run --name monkey-island --network=host -d guardicore/monkey-island:
There's no "upgrade-in-place" option for Docker. To get the new version, download it, stop the current container, and run the installation commands again with the new file.
-If you'd like to keep your existing configuration, you can export it to a file by using the Export button and then import it to the new server.
+If you'd like to keep your existing configuration, you can export it to a file by using the export button and then import it to the new server.
From 9a1ce32900737bdfc33ac29c84e4d4b8184dff91 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 14:09:46 -0500
Subject: [PATCH 24/36] Update docker.md
---
docs/content/setup/docker.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/content/setup/docker.md b/docs/content/setup/docker.md
index ba613d57b..15e62ced2 100644
--- a/docs/content/setup/docker.md
+++ b/docs/content/setup/docker.md
@@ -23,8 +23,8 @@ sudo docker run --name monkey-island --network=host -d guardicore/monkey-island:
## Upgrading
-There's no "upgrade-in-place" option for Docker. To get the new version, download it, stop the current container, and run the installation commands again with the new file.
+Currently, there's no "upgrade-in-place" option when a new version is released. To get an updated version, download it, stop the current container and run the installation commands again with the new file.
-If you'd like to keep your existing configuration, you can export it to a file by using the export button and then import it to the new server.
+If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
From 4c3dd3e84ff3494974686f3d3bfe84c057152dd0 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Fri, 22 Jan 2021 13:09:47 -0500
Subject: [PATCH 25/36] Update vmware.md
Copyediting - note: the original had upgrade instructions for docker, so please advise on correct steps to update the Monkey on VMware, thanks!
---
docs/content/setup/vmware.md | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/docs/content/setup/vmware.md b/docs/content/setup/vmware.md
index 5ee958188..d39b9b06f 100644
--- a/docs/content/setup/vmware.md
+++ b/docs/content/setup/vmware.md
@@ -9,28 +9,25 @@ tags: ["setup", "vmware"]
## Deployment
-1. Deploy the Infection Monkey OVA by choosing Deploy OVF Template and follow the wizard instructions. *Note: make sure port 5000 and 5001 on the machine are accessible for inbound TCP traffic.*
+1. Deploy the Infection Monkey OVA by choosing **Deploy OVF Template** and following the wizard instructions. *Note: make sure ports 5000 and 5001 on the machine are accessible for inbound TCP traffic.*
2. Turn on the Infection Monkey VM.
3. Log in to the machine with the following credentials:
1. Username: **monkeyuser**
2. Password: **Noon.Earth.Always**
-4. It's recommended to change the machine passwords by running the following commands: `sudo passwd monkeyuser`, `sudo passwd root`.
+4. It's recommended you change the machine passwords by running the following commands: `sudo passwd monkeyuser`, `sudo passwd root`.
## OVA network modes
-The OVA can be used in one of two modes:
+You can use the OVA in one of two modes:
-1. In a network with DHCP configured. In this case, the Monkey Island will automatically query and receive an IP address from the network.
-1. With a static IP address.
-
- In this case, you should login to the VM console with
-username `root` and password `G3aJ9szrvkxTmfAG`. After logging in, edit the interfaces file. You can do that by writing the following command in the prompt:
+1. In a network with the DHCP configured— In this case, the Monkey Island will automatically query and receive an IP address from the network.
+2. With a static IP address — For this case, you should login to the VM console with the username `root` and the password `G3aJ9szrvkxTmfAG`. After logging in, edit the interfaces file by writing the following command in the prompt:
```sh
sudo nano /etc/network/interfaces
```
- And change the lines:
+ Change the lines:
```sh
auto ens160
@@ -47,7 +44,7 @@ username `root` and password `G3aJ9szrvkxTmfAG`. After logging in, edit the inte
gateway YYY.YYY.YYY.YYY
```
- Save the changes then run the command
+ Save the changes then run the command:
```sh
sudo ifdown ens160 && ifup ens160
@@ -55,8 +52,6 @@ username `root` and password `G3aJ9szrvkxTmfAG`. After logging in, edit the inte
## Upgrading
-There's no "upgrade-in-place" option for Docker. To get the new version, download it, stop the current container, and run the installation commands again with the new file.
-
-If you'd like to keep your existing configuration, you can export it to a file by using the Export button and then import it to the new server.
+There's no "upgrade-in-place" option for VMware. To get the new version, download the updated file. If you'd like to keep your existing configuration, you can export it to a file by using the Export button and then import it to the new server.
From b60ffe51fe0e15d47d881d3cd92a243f873b04d3 Mon Sep 17 00:00:00 2001
From: MarketingYeti <77474444+MarketingYeti@users.noreply.github.com>
Date: Tue, 26 Jan 2021 13:36:51 -0500
Subject: [PATCH 26/36] Update vmware.md
---
docs/content/setup/vmware.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/content/setup/vmware.md b/docs/content/setup/vmware.md
index d39b9b06f..11c0ab092 100644
--- a/docs/content/setup/vmware.md
+++ b/docs/content/setup/vmware.md
@@ -10,18 +10,18 @@ tags: ["setup", "vmware"]
## Deployment
1. Deploy the Infection Monkey OVA by choosing **Deploy OVF Template** and following the wizard instructions. *Note: make sure ports 5000 and 5001 on the machine are accessible for inbound TCP traffic.*
-2. Turn on the Infection Monkey VM.
-3. Log in to the machine with the following credentials:
+1. Turn on the Infection Monkey VM.
+1. Log in to the machine with the following credentials:
1. Username: **monkeyuser**
- 2. Password: **Noon.Earth.Always**
-4. It's recommended you change the machine passwords by running the following commands: `sudo passwd monkeyuser`, `sudo passwd root`.
+ 1. Password: **Noon.Earth.Always**
+1. It's recommended you change the machine passwords by running the following commands: `sudo passwd monkeyuser`, `sudo passwd root`.
## OVA network modes
You can use the OVA in one of two modes:
-1. In a network with the DHCP configured— In this case, the Monkey Island will automatically query and receive an IP address from the network.
-2. With a static IP address — For this case, you should login to the VM console with the username `root` and the password `G3aJ9szrvkxTmfAG`. After logging in, edit the interfaces file by writing the following command in the prompt:
+1. In a network with the DHCP configured — In this case, the Monkey Island will automatically query and receive an IP address from the network.
+1. With a static IP address — In this case, you should log in to the VM console with the username `root` and the password `G3aJ9szrvkxTmfAG`. After logging in, edit the interfaces file by writing the following command in the prompt:
```sh
sudo nano /etc/network/interfaces
@@ -52,6 +52,6 @@ You can use the OVA in one of two modes:
## Upgrading
-There's no "upgrade-in-place" option for VMware. To get the new version, download the updated file. If you'd like to keep your existing configuration, you can export it to a file by using the Export button and then import it to the new server.
+Currently, there's no "upgrade-in-place" option when a new version is released. To get an updated version, download the updated OVA file. If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
From 69f4df49bd706ddf4cd9667be4a975a0adb97e76 Mon Sep 17 00:00:00 2001
From: Mike Salvatore
Date: Wed, 27 Jan 2021 12:04:11 -0500
Subject: [PATCH 27/36] docs: trivial rewording of vmware.md
---
docs/content/setup/vmware.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/content/setup/vmware.md b/docs/content/setup/vmware.md
index 11c0ab092..703d2d842 100644
--- a/docs/content/setup/vmware.md
+++ b/docs/content/setup/vmware.md
@@ -21,7 +21,7 @@ tags: ["setup", "vmware"]
You can use the OVA in one of two modes:
1. In a network with the DHCP configured — In this case, the Monkey Island will automatically query and receive an IP address from the network.
-1. With a static IP address — In this case, you should log in to the VM console with the username `root` and the password `G3aJ9szrvkxTmfAG`. After logging in, edit the interfaces file by writing the following command in the prompt:
+1. With a static IP address — In this case, you should log in to the VM console with the username `root` and the password `G3aJ9szrvkxTmfAG`. After logging in, edit the interfaces file by entering the following command in the prompt:
```sh
sudo nano /etc/network/interfaces
From bc29973c80a5b899883c6110b31ec37e901a026f Mon Sep 17 00:00:00 2001
From: Mike Salvatore
Date: Wed, 27 Jan 2021 12:51:00 -0500
Subject: [PATCH 28/36] docs: remove duplicate header from debian.md
---
docs/content/setup/debian.md | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/docs/content/setup/debian.md b/docs/content/setup/debian.md
index d94785dc8..d3a861f43 100644
--- a/docs/content/setup/debian.md
+++ b/docs/content/setup/debian.md
@@ -8,16 +8,6 @@ disableToc: false
tags: ["setup", "debian", "linux"]
---
----
-title: "Debian"
-date: 2020-05-26T20:57:19+03:00
-draft: false
-pre: ' '
-weight: 1
-disableToc: false
-tags: ["setup", "debian", "linux"]
----
-
## Deployment
To extract the `tar.gz` file, run `tar -xvzf monkey-island-debian.tar.gz`.
From ee9f177201cd0970db3f1447373f2e7678ec2018 Mon Sep 17 00:00:00 2001
From: Mike Salvatore
Date: Wed, 27 Jan 2021 12:54:35 -0500
Subject: [PATCH 29/36] docs: make upgrade instructions consistent
---
docs/content/setup/aws.md | 6 +++++-
docs/content/setup/azure.md | 6 +++++-
docs/content/setup/debian.md | 8 ++++++--
docs/content/setup/docker.md | 7 +++++--
docs/content/setup/vmware.md | 6 +++++-
docs/content/setup/windows.md | 6 ++++--
6 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/docs/content/setup/aws.md b/docs/content/setup/aws.md
index eaa364cc8..9e17780ed 100644
--- a/docs/content/setup/aws.md
+++ b/docs/content/setup/aws.md
@@ -35,6 +35,10 @@ The Infection Monkey has built-in integrations with AWS services for better exec
## Upgrading
-Currently, there's no "upgrade-in-place" option when a new version is released. To get an updated version, you can deploy a new machine from the marketplace. If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
+Currently, there's no "upgrade-in-place" option when a new version is released.
+To get an updated version, you can deploy a new machine from the marketplace.
+
+If you'd like to keep your existing configuration, you can export it to a file
+using the *Export config* button and then import it to the new Monkey Island.
diff --git a/docs/content/setup/azure.md b/docs/content/setup/azure.md
index d31a62047..75feaabf3 100644
--- a/docs/content/setup/azure.md
+++ b/docs/content/setup/azure.md
@@ -29,6 +29,10 @@ At this point, Azure will instance and deploy your new machine. When ready, you
## Upgrading
-Currently, there's no "upgrade-in-place" option when a new version is released. To get the updated version, you can deploy a new machine from the marketplace. If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
+Currently, there's no "upgrade-in-place" option when a new version is released.
+To get the updated version, you can deploy a new machine from the marketplace.
+
+If you'd like to keep your existing configuration, you can export it to a file
+using the *Export config* button and then import it to the new Monkey Island.
diff --git a/docs/content/setup/debian.md b/docs/content/setup/debian.md
index d3a861f43..d841a179f 100644
--- a/docs/content/setup/debian.md
+++ b/docs/content/setup/debian.md
@@ -57,9 +57,13 @@ To check the status of the Monkey Island after the installation, run the followi
## Upgrading
-Currently, there's no "upgrade-in-place" option when a new version is released. To get the updated version, download the new `.deb` file and install it. You should see a message like `Unpacking monkey-island (1.8.2) over (1.8.0)`. After which, the installation should complete successfully.
+Currently, there's no "upgrade-in-place" option when a new version is released.
+To get the updated version, download the new `.deb` file and install it. You
+should see a message like `Unpacking monkey-island (1.8.2) over (1.8.0)`. After
+which, the installation should complete successfully.
-If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
+If you'd like to keep your existing configuration, you can export it to a file
+using the *Export config* button and then import it to the new Monkey Island.
diff --git a/docs/content/setup/docker.md b/docs/content/setup/docker.md
index 15e62ced2..5b89d42b6 100644
--- a/docs/content/setup/docker.md
+++ b/docs/content/setup/docker.md
@@ -23,8 +23,11 @@ sudo docker run --name monkey-island --network=host -d guardicore/monkey-island:
## Upgrading
-Currently, there's no "upgrade-in-place" option when a new version is released. To get an updated version, download it, stop the current container and run the installation commands again with the new file.
+Currently, there's no "upgrade-in-place" option when a new version is released.
+To get an updated version, download it, stop the current container and run the
+installation commands again with the new file.
-If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
+If you'd like to keep your existing configuration, you can export it to a file
+using the *Export config* button and then import it to the new Monkey Island.
diff --git a/docs/content/setup/vmware.md b/docs/content/setup/vmware.md
index 703d2d842..5bb2ffb51 100644
--- a/docs/content/setup/vmware.md
+++ b/docs/content/setup/vmware.md
@@ -52,6 +52,10 @@ You can use the OVA in one of two modes:
## Upgrading
-Currently, there's no "upgrade-in-place" option when a new version is released. To get an updated version, download the updated OVA file. If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new Monkey Island.
+Currently, there's no "upgrade-in-place" option when a new version is released.
+To get an updated version, download the updated OVA file.
+
+If you'd like to keep your existing configuration, you can export it to a file
+using the *Export config* button and then import it to the new Monkey Island.
diff --git a/docs/content/setup/windows.md b/docs/content/setup/windows.md
index 514b999f8..9fc838127 100644
--- a/docs/content/setup/windows.md
+++ b/docs/content/setup/windows.md
@@ -28,8 +28,10 @@ The Monkey Island supports Chrome (and Chrome-based) browsers. If your Windows s
## Upgrading
-To upgrade the Infection Monkey on Windows, download the new installer and run it. The new Monkey version will be installed over the old version.
+To upgrade the Infection Monkey on Windows, download the new installer and run
+it. The new Monkey version will be installed over the old version.
-If you'd like to keep your existing configuration, you can export it to a file using the *Export config* button and then import it to the new server.
+If you'd like to keep your existing configuration, you can export it to a file
+using the *Export config* button and then import it to the new Monkey Island.
From cbe9c6776d0a41a10bf96957a59a465b44a88c05 Mon Sep 17 00:00:00 2001
From: Mike Salvatore
Date: Wed, 27 Jan 2021 12:58:22 -0500
Subject: [PATCH 30/36] docs: small tweaks to debian setup guide
---
docs/content/setup/debian.md | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/docs/content/setup/debian.md b/docs/content/setup/debian.md
index d841a179f..ded13c087 100644
--- a/docs/content/setup/debian.md
+++ b/docs/content/setup/debian.md
@@ -12,7 +12,7 @@ tags: ["setup", "debian", "linux"]
To extract the `tar.gz` file, run `tar -xvzf monkey-island-debian.tar.gz`.
-To deploy the package, once you’ve extracted it, run the following commands:
+Once you've extracted the package, deploy it using run the following commands:
```sh
sudo apt update
@@ -28,7 +28,9 @@ Errors were encountered while processing:
gc-monkey-island
```
-It just means that not all dependencies were pre-installed on your system. That’s no problem! Just run the following command, which will install all dependencies, and then install the Monkey Island:
+It just means that not all dependencies were pre-installed on your system.
+That’s no problem! Just run the following command, which will install all
+dependencies, and then install the Monkey Island:
```sh
sudo apt install -f
@@ -38,7 +40,10 @@ sudo apt install -f
### Trying to install on Ubuntu <16.04
-If you’re trying to install the Monkey Island on Ubuntu 16.04 or older, you need to install the dependencies yourself, since Python 3.7 is only installable from the `deadsnakes` PPA. To install the Monkey Island on Ubuntu 16.04, follow these steps:
+If you’re trying to install the Monkey Island on Ubuntu 16.04 or older, you
+need to install the dependencies yourself, since Python 3.7 is only installable
+from the `deadsnakes` PPA. To install the Monkey Island on Ubuntu 16.04, follow
+these steps:
```sh
sudo apt update
From 5e3a8994d25b9e1b8e3f5d41261233beecf13ccb Mon Sep 17 00:00:00 2001
From: Mike Salvatore
Date: Wed, 27 Jan 2021 13:13:25 -0500
Subject: [PATCH 31/36] docs: replace single right quote (U+2019) with
apostrophe (ascii 0x27)
---
docs/content/FAQ/_index.md | 24 +++++++++----------
docs/content/reports/mitre.md | 4 ++--
docs/content/reports/zero-trust.md | 4 ++--
docs/content/setup/aws.md | 2 +-
docs/content/setup/debian.md | 4 ++--
docs/content/setup/docker.md | 2 +-
docs/content/setup/windows.md | 4 ++--
docs/content/usage/use-cases/attack.md | 2 +-
.../usage/use-cases/credential-leak.md | 6 ++---
.../usage/use-cases/network-segmentation.md | 2 +-
docs/content/usage/use-cases/other.md | 2 +-
11 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/docs/content/FAQ/_index.md b/docs/content/FAQ/_index.md
index 3486a4fc4..89bbf8aba 100644
--- a/docs/content/FAQ/_index.md
+++ b/docs/content/FAQ/_index.md
@@ -5,7 +5,7 @@ draft: false
pre: " "
---
-Here are some of the most common questions we receive about the Infection Monkey. If the answer you’re looking for isn’t here, talk with us [on our Slack channel](https://infectionmonkey.slack.com/join/shared_invite/enQtNDU5MjAxMjg1MjU1LWM0NjVmNWE2ZTMzYzAxOWJiYmMxMzU0NWU3NmUxYjcyNjk0YWY2MDkwODk4NGMyNDU4NzA4MDljOWNmZWViNDU), email us at [support@infectionmonkey.com](mailto:support@infectionmonkey.com) or [open an issue on GitHub](https://github.com/guardicore/monkey).
+Here are some of the most common questions we receive about the Infection Monkey. If the answer you're looking for isn't here, talk with us [on our Slack channel](https://infectionmonkey.slack.com/join/shared_invite/enQtNDU5MjAxMjg1MjU1LWM0NjVmNWE2ZTMzYzAxOWJiYmMxMzU0NWU3NmUxYjcyNjk0YWY2MDkwODk4NGMyNDU4NzA4MDljOWNmZWViNDU), email us at [support@infectionmonkey.com](mailto:support@infectionmonkey.com) or [open an issue on GitHub](https://github.com/guardicore/monkey).
- [Where can I get the latest Monkey version? 📰](#where-can-i-get-the-latest-monkey-version)
- [How long does a single Monkey run for? Is there a time limit?](#how-long-does-a-single-monkey-run-for-is-there-a-time-limit)
@@ -17,11 +17,11 @@ Here are some of the most common questions we receive about the Infection Monkey
- [Monkey agent](#monkey-agent)
- [Running the Monkey in a production environment](#running-the-monkey-in-a-production-environment)
- [How much of a footprint does the Monkey leave?](#how-much-of-a-footprint-does-the-monkey-leave)
- - [What’s the Monkey’s impact on system resources usage?](#whats-the-monkeys-impact-on-system-resources-usage)
- - [Is it safe to use real passwords and usernames in the Monkey’s configuration?](#is-it-safe-to-use-real-passwords-and-usernames-in-the-monkeys-configuration)
+ - [What's the Monkey's impact on system resources usage?](#whats-the-monkeys-impact-on-system-resources-usage)
+ - [Is it safe to use real passwords and usernames in the Monkey's configuration?](#is-it-safe-to-use-real-passwords-and-usernames-in-the-monkeys-configuration)
- [How do you store sensitive information on Monkey Island?](#how-do-you-store-sensitive-information-on-monkey-island)
- [How stable are the exploitations used by the Monkey? Will the Monkey crash my systems with its exploits?](#how-stable-are-the-exploitations-used-by-the-monkey-will-the-monkey-crash-my-systems-with-its-exploits)
-- [After I’ve set up Monkey Island, how can I execute the Monkey?](#after-ive-set-up-monkey-island-how-can-i-execute-the-monkey)
+- [After I've set up Monkey Island, how can I execute the Monkey?](#after-ive-set-up-monkey-island-how-can-i-execute-the-monkey)
- [How can I make the monkey propagate “deeper” into the network?](#how-can-i-make-the-monkey-propagate-deeper-into-the-network)
- [The report returns a blank screen](#the-report-returns-a-blank-screen)
- [How can I get involved with the project? 👩💻👨💻](#how-can-i-get-involved-with-the-project)
@@ -77,7 +77,7 @@ The Monkey performs queries out to the Internet on two separate occasions:
### Monkey Island
-The Monkey Island’s log file can be downloaded directly from the UI. Click the “log” section and choose “Download Monkey Island internal logfile”, like so:
+The Monkey Island's log file can be downloaded directly from the UI. Click the “log” section and choose “Download Monkey Island internal logfile”, like so:
@@ -98,7 +98,7 @@ The Monkey log file can be found in the following paths on machines where it was
- Path on Linux: `/tmp/user-1563`
- Path on Windows: `%temp%\\~df1563.tmp`
-The logs contain information about the internals of the Monkey’s execution. The log will contain entries like these ones for example:
+The logs contain information about the internals of the Monkey's execution. The log will contain entries like these ones for example:
```log
2019-07-22 19:16:44,228 [77598:140654230214464:INFO] main.main.116: >>>>>>>>>> Initializing monkey (InfectionMonkey): PID 77598 <<<<<<<<<<
@@ -124,13 +124,13 @@ The Monkey leaves hardly any trace on the target system. It will leave:
- Path on Linux: `/tmp/user-1563`
- Path on Windows: `%temp%\\~df1563.tmp`
-### What’s the Monkey’s impact on system resources usage?
+### What's the Monkey's impact on system resources usage?
The Infection Monkey uses less than single-digit percent of CPU time and very low RAM usage. For example, on a single-core Windows Server machine, the Monkey consistently uses 0.06% CPU, less than 80MB of RAM and a small amount of I/O periodically.
If you do experience any performance issues please let us know on [our Slack channel](https://infectionmonkey.slack.com/) or via [opening an issue on GitHub](https://github.com/guardicore/monkey).
-### Is it safe to use real passwords and usernames in the Monkey’s configuration?
+### Is it safe to use real passwords and usernames in the Monkey's configuration?
Absolutely! User credentials are stored encrypted in the Monkey Island server. This information is then accessible only to users that have access to the Island.
@@ -138,7 +138,7 @@ We advise to limit access to the Monkey Island server by following our [password
### How do you store sensitive information on Monkey Island?
-Sensitive data such as passwords, SSH keys and hashes are stored on the Monkey Island’s database in an encrypted fashion. This data is transmitted to the Infection Monkeys in an encrypted fashion (HTTPS) and is not stored locally on the victim machines.
+Sensitive data such as passwords, SSH keys and hashes are stored on the Monkey Island's database in an encrypted fashion. This data is transmitted to the Infection Monkeys in an encrypted fashion (HTTPS) and is not stored locally on the victim machines.
When you reset the Monkey Island configuration, the Monkey Island wipes the information.
@@ -146,9 +146,9 @@ When you reset the Monkey Island configuration, the Monkey Island wipes the info
The Monkey does not use any exploits or attacks that may impact the victim system.
-This means we avoid using some very strong (and famous) exploits such as [EternalBlue](https://www.guardicore.com/2017/05/detecting-mitigating-wannacry-copycat-attacks-using-guardicore-centra-platform/). This exploit was used in WannaCry and NotPetya with huge impact. But because it may crash a production system, we aren’t using it.
+This means we avoid using some very strong (and famous) exploits such as [EternalBlue](https://www.guardicore.com/2017/05/detecting-mitigating-wannacry-copycat-attacks-using-guardicore-centra-platform/). This exploit was used in WannaCry and NotPetya with huge impact. But because it may crash a production system, we aren't using it.
-## After I’ve set up Monkey Island, how can I execute the Monkey?
+## After I've set up Monkey Island, how can I execute the Monkey?
See our detailed [getting started](../content/usage/getting-started) guide.
@@ -175,6 +175,6 @@ The Monkey is an open-source project, and we weclome contributions and contribut
### How did you come up with the Infection Monkey?
-Oddly enough, the idea of proactively breaking the network to test its survival wasn’t born in the security industry. In 2011, the streaming giant Netflix released Chaos Monkey, a tool that was designed to randomly disable the company’s production servers to verify they could survive network failures without any customer impact. Netflix's Chaos Monkey became a popular network resilience tool, breaking the network in a variety of failure modes, including connectivity issues, invalid SSL certificates and randomly deleting VMs.
+Oddly enough, the idea of proactively breaking the network to test its survival wasn't born in the security industry. In 2011, the streaming giant Netflix released Chaos Monkey, a tool that was designed to randomly disable the company's production servers to verify they could survive network failures without any customer impact. Netflix's Chaos Monkey became a popular network resilience tool, breaking the network in a variety of failure modes, including connectivity issues, invalid SSL certificates and randomly deleting VMs.
Inspired by this concept, Guardicore Labs developed its own attack simulator - Infection Monkey - to run non-intrusively within existing production environments. The idea was to test the resiliency of modern data centers against attack and give security teams the insights they need to make informed decisions and enforce tighter security policies. Since its launch in 2017 (?) the Infection Monkey has been used by hundreds of information technology teams from across the world to find weaknesses in their on-premises and cloud-based data centers.
diff --git a/docs/content/reports/mitre.md b/docs/content/reports/mitre.md
index 760893534..96d0b20b2 100644
--- a/docs/content/reports/mitre.md
+++ b/docs/content/reports/mitre.md
@@ -24,11 +24,11 @@ The MITRE ATT&CK report is centred around the ATT&CK matrix:
The Monkey rates your network on the attack techniques it attempted. For each technique, you can get
- {{< label danger Red >}}: The Monkey **successfully used** the technique in the simulation. That means your network is vulnerable to this technique being employed.
-- {{< label warning Yellow >}}: The Monkey **tried to use** the technique, but didn’t manage to. That means your network isn’t vulnerable to the way Monkey employs this technique.
+- {{< label warning Yellow >}}: The Monkey **tried to use** the technique, but didn't manage to. That means your network isn't vulnerable to the way Monkey employs this technique.
- {{< label unused "Dark Gray" >}}: The Monkey **didn't try** the technique. Perhaps it wasn't relevant to this network.
- {{< label disabled "Light Gray" >}}: The Monkey **didn't try** the technique since it wasn't configured.
-Then, you can see exactly HOW the technique was used in this attack, and also what you should do to mitigate it, by clicking on the technique and seeing the details. For example, let’s look at the [**Brute Force**](https://attack.mitre.org/techniques/T1110/) technique that’s a part of employing the [**Credentials Access**](https://attack.mitre.org/tactics/TA0006/) tactic:
+Then, you can see exactly HOW the technique was used in this attack, and also what you should do to mitigate it, by clicking on the technique and seeing the details. For example, let's look at the [**Brute Force**](https://attack.mitre.org/techniques/T1110/) technique that's a part of employing the [**Credentials Access**](https://attack.mitre.org/tactics/TA0006/) tactic:
diff --git a/docs/content/reports/zero-trust.md b/docs/content/reports/zero-trust.md
index 54c9aff31..1bbd2dbd4 100644
--- a/docs/content/reports/zero-trust.md
+++ b/docs/content/reports/zero-trust.md
@@ -13,10 +13,10 @@ The Guardicore Infection Monkey runs different tests to evaluate your network ad
## Summary
-This diagram provides a quick glance at how your organization scores on each component of the Forrester’s Zero Trust model with **Failed**, **Verify**, **Passed** and **Unexecuted** verdicts.
+This diagram provides a quick glance at how your organization scores on each component of the Forrester's Zero Trust model with **Failed**, **Verify**, **Passed** and **Unexecuted** verdicts.
- {{< label danger Failed >}} At least one of the tests related to this component failed. This means that the Infection Monkey detected an unmet Zero Trust requirement.
-- {{< label warning Verify >}} At least one of the tests’ results related to this component requires further manual verification.
+- {{< label warning Verify >}} At least one of the tests' results related to this component requires further manual verification.
- {{< label success Passed >}} All Tests related to this pillar passed. No violation of a Zero Trust guiding principle was detected.
- {{< label unused Unexecuted >}} This status means no tests were executed for this pillar.
diff --git a/docs/content/setup/aws.md b/docs/content/setup/aws.md
index 9e17780ed..eb08b4968 100644
--- a/docs/content/setup/aws.md
+++ b/docs/content/setup/aws.md
@@ -9,7 +9,7 @@ tags: ["setup", "aws"]
## Deployment
-On the [Infection Monkey’s AWS Marketplace page](https://aws.amazon.com/marketplace/pp/GuardiCore-Infection-Monkey/B07B3J7K6D), click **Continue to Subscribe**.
+On the [Infection Monkey's AWS Marketplace page](https://aws.amazon.com/marketplace/pp/GuardiCore-Infection-Monkey/B07B3J7K6D), click **Continue to Subscribe**.
1. Choose the desired region.
1. Choose an EC2 instance type with at least 1GB of RAM for optimal performance or stick with the default recommendation.
diff --git a/docs/content/setup/debian.md b/docs/content/setup/debian.md
index ded13c087..c2e875b68 100644
--- a/docs/content/setup/debian.md
+++ b/docs/content/setup/debian.md
@@ -29,7 +29,7 @@ Errors were encountered while processing:
```
It just means that not all dependencies were pre-installed on your system.
-That’s no problem! Just run the following command, which will install all
+That's no problem! Just run the following command, which will install all
dependencies, and then install the Monkey Island:
```sh
@@ -40,7 +40,7 @@ sudo apt install -f
### Trying to install on Ubuntu <16.04
-If you’re trying to install the Monkey Island on Ubuntu 16.04 or older, you
+If you're trying to install the Monkey Island on Ubuntu 16.04 or older, you
need to install the dependencies yourself, since Python 3.7 is only installable
from the `deadsnakes` PPA. To install the Monkey Island on Ubuntu 16.04, follow
these steps:
diff --git a/docs/content/setup/docker.md b/docs/content/setup/docker.md
index 5b89d42b6..66d38efc5 100644
--- a/docs/content/setup/docker.md
+++ b/docs/content/setup/docker.md
@@ -11,7 +11,7 @@ tags: ["setup", "docker", "linux", "windows"]
To extract the `tar.gz` file, run `tar -xvzf monkey-island-docker.tar.gz`.
-Once you’ve extracted the container from the tar.gz file, run the following commands:
+Once you've extracted the container from the tar.gz file, run the following commands:
```sh
sudo docker load -i dk.monkeyisland.1.9.0.tar
diff --git a/docs/content/setup/windows.md b/docs/content/setup/windows.md
index 9fc838127..9b22b87dc 100644
--- a/docs/content/setup/windows.md
+++ b/docs/content/setup/windows.md
@@ -4,7 +4,7 @@ date: 2020-05-26T20:57:10+03:00
draft: false
pre: ' '
weight: 2
-tags: ["setup", "windows"]
+tags: ["setup", "windows"]
---
## Deployment
@@ -20,7 +20,7 @@ After running the installer, the following prompt should appear on the screen:
### Missing Windows update
-The installer requires [Windows update #2999226](https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows). If you’re having trouble running the installer, please make sure to install the update via Windows Update or manually from the link above.
+The installer requires [Windows update #2999226](https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows). If you're having trouble running the installer, please make sure to install the update via Windows Update or manually from the link above.
### Supported browsers
diff --git a/docs/content/usage/use-cases/attack.md b/docs/content/usage/use-cases/attack.md
index ee2e002c7..d3e09fadc 100644
--- a/docs/content/usage/use-cases/attack.md
+++ b/docs/content/usage/use-cases/attack.md
@@ -9,7 +9,7 @@ weight: 2
## Overview
Infection Monkey can simulate various [ATT&CK](https://attack.mitre.org/matrices/enterprise/) techniques on the network.
-Use it to assess your security solutions’ detection and prevention capabilities. Infection Monkey will help you find
+Use it to assess your security solutions' detection and prevention capabilities. Infection Monkey will help you find
which ATT&CK techniques go unnoticed and will provide recommendations about preventing them.
diff --git a/docs/content/usage/use-cases/credential-leak.md b/docs/content/usage/use-cases/credential-leak.md
index 923335e34..0533db0e8 100644
--- a/docs/content/usage/use-cases/credential-leak.md
+++ b/docs/content/usage/use-cases/credential-leak.md
@@ -16,9 +16,9 @@ where these credentials can be reused.
## Configuration
-- **Exploits -> Credentials** After setting up the Island add the users’ **real** credentials
-(usernames and passwords) to the Monkey’s configuration (Don’t worry, this sensitive data is not accessible and is not
- distributed or used in any way other than being sent to the monkeys, and can be easily eliminated by resetting the Monkey Island’s configuration).
+- **Exploits -> Credentials** After setting up the Island add the users' **real** credentials
+(usernames and passwords) to the Monkey's configuration (Don't worry, this sensitive data is not accessible and is not
+ distributed or used in any way other than being sent to the monkeys, and can be easily eliminated by resetting the Monkey Island's configuration).
- **Internal -> Exploits -> SSH keypair list** Monkey automatically gathers SSH keys on the current system.
For this to work, Monkey Island or initial Monkey needs to have access to SSH key files(grant permission or run Monkey as root).
To make sure SSH keys were gathered successfully, refresh the page and check this configuration value after you run the Monkey
diff --git a/docs/content/usage/use-cases/network-segmentation.md b/docs/content/usage/use-cases/network-segmentation.md
index 543b6e645..31bd6a2c3 100644
--- a/docs/content/usage/use-cases/network-segmentation.md
+++ b/docs/content/usage/use-cases/network-segmentation.md
@@ -13,7 +13,7 @@ isolate workloads from one another and secure them individually, typically using
the effectiveness of your segmentation is to ensure that your network segments are properly separated, e,g, your
Development is separated from your Production, your applications are separated from one another etc. Use the
Infection Monkey to verify that your network segmentation is configured properly. This way you make sure that
-even if a certain attacker has breached your defenses, it can’t move laterally between segments.
+even if a certain attacker has breached your defenses, it can't move laterally between segments.
[Segmentation is key](https://www.guardicore.com/use-cases/micro-segmentation/) to protecting your network, reducing
the attack surface and minimizing the damage of a breach. The Monkey can help you test your segmentation settings with
diff --git a/docs/content/usage/use-cases/other.md b/docs/content/usage/use-cases/other.md
index 90c44a943..2a17212b8 100644
--- a/docs/content/usage/use-cases/other.md
+++ b/docs/content/usage/use-cases/other.md
@@ -43,7 +43,7 @@ exploitations by running consecutive Infection Monkey scans.
## Credentials
Every network has its old “skeleton keys” that should have long been discarded. Configure the Monkey with old and stale
-passwords, but make sure that they were really discarded using the Monkey. To add the old passwords, in the island’s
+passwords, but make sure that they were really discarded using the Monkey. To add the old passwords, in the island's
configuration, go to the “Exploit password list” under “Basic - Credentials” and use the “+” button to add the old
passwords to the configuration. For example, here we added a few extra passwords (and a username as well) to the
configuration:
From e63e8fada695f01e9526cf744d5d0a0d8dd2e6ba Mon Sep 17 00:00:00 2001
From: Mike Salvatore
Date: Wed, 27 Jan 2021 13:21:49 -0500
Subject: [PATCH 32/36] docs: small changes to azure setup guide
---
docs/content/setup/azure.md | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/docs/content/setup/azure.md b/docs/content/setup/azure.md
index 75feaabf3..dcb50e7fd 100644
--- a/docs/content/setup/azure.md
+++ b/docs/content/setup/azure.md
@@ -4,7 +4,7 @@ date: 2020-05-26T20:57:39+03:00
draft: false
pre: ' '
weight: 6
-tags: ["setup", "azure"]
+tags: ["setup", "azure"]
---
## Deployment
@@ -12,18 +12,19 @@ tags: ["setup", "azure"]
Select the [Infection Monkey from the Azure Marketplace](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/guardicore.infection_monkey) and click **GET IT NOW**.
1. Under **Basics**:
- 1. Choose a name for the Infection Monkey instance, such as InfectionMonkey.
- 1. Choose a username and password or provide an SSH public key for authentication.
+ 1. Choose a name for the new Infection Monkey instance, such as InfectionMonkey.
+ 1. Choose a username and password, or provide an SSH public key for authentication.
1. Choose a resource group and the location for the Infection Monkey instance.
1. Under **Size**
1. Choose a machine size with at least 1GB of RAM for optimal performance.
1. Under **Settings**
- 1. Choose the network for your new instance.
+ 1. Choose the network for the new instance.
1. In the **Network Security Group** field, make sure ports 5000 and 5001 on the machine are accessible for inbound TCP traffic.
1. Under **Summary**
1. Review the details of the offer and click **Create**.
-At this point, Azure will instance and deploy your new machine. When ready, you can browse to the Infection Monkey running on your fresh deployment at:
+At this point, Azure will provision and deploy your new machine. When ready,
+you can browse to the Infection Monkey running on your fresh deployment at:
`https://{public-ip-address}:5000`
From 819ae2418991be31aa278769de64f45137bdd1ae Mon Sep 17 00:00:00 2001
From: Mike Salvatore
Date: Wed, 27 Jan 2021 13:23:11 -0500
Subject: [PATCH 33/36] docs: small changes to aws setup guide
---
docs/content/setup/aws.md | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/docs/content/setup/aws.md b/docs/content/setup/aws.md
index eb08b4968..916889ba6 100644
--- a/docs/content/setup/aws.md
+++ b/docs/content/setup/aws.md
@@ -4,7 +4,7 @@ date: 2020-05-26T20:57:36+03:00
draft: false
pre: ' '
weight: 5
-tags: ["setup", "aws"]
+tags: ["setup", "aws"]
---
## Deployment
@@ -13,24 +13,29 @@ On the [Infection Monkey's AWS Marketplace page](https://aws.amazon.com/marketpl
1. Choose the desired region.
1. Choose an EC2 instance type with at least 1GB of RAM for optimal performance or stick with the default recommendation.
-1. Select the VPC and subnet you want to use for your instance.
+1. Select the VPC and subnet you want to use for the new instance.
1. In the Security Group section, make sure ports 5000 and 5001 on the machine are accessible for inbound TCP traffic.
-1. Choose an existing EC2 key pair for authenticating with your new instance.
+1. Choose an existing EC2 key pair for authenticating with the new instance.
1. Click **Launch with 1-click.**
-At this point, AWS will instance and deploy your new machine.
+At this point, AWS will instance and deploy the new machine.
-When ready, you can browse to the Infection Monkey running on your fresh deployment at:
+When ready, you can browse to the Infection Monkey running on the fresh deployment at:
`https://{public-ip}:5000`
-You will be presented with a login page. Enter the username **monkey**, and the new EC2 instance's **instance ID** for your password. To find your instance ID, go to the EC2 console and select your instance. It should appear in the details pane below.
+You will be presented with a login page. Enter the username **monkey**, and the
+new EC2 instance's **instance ID** for your password. To find your instance ID,
+go to the EC2 console and select your instance. It should appear in the details
+pane below.
## Integration with AWS services
-The Infection Monkey has built-in integrations with AWS services for better execution and reporting. See [Usage -> Integrations](../../usage/integrations) for more details.
+The Infection Monkey has built-in integrations with AWS services for better
+execution and reporting. See [Usage -> Integrations](../../usage/integrations)
+for more details.
## Upgrading
From 243714d8ba23b8cd3d16b0c01bd23228b4f5a396 Mon Sep 17 00:00:00 2001
From: Mike Salvatore
Date: Wed, 27 Jan 2021 13:23:40 -0500
Subject: [PATCH 34/36] docs: remove trailing whitespace in docker setup guide
---
docs/content/setup/docker.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/content/setup/docker.md b/docs/content/setup/docker.md
index 66d38efc5..fb70347f2 100644
--- a/docs/content/setup/docker.md
+++ b/docs/content/setup/docker.md
@@ -4,7 +4,7 @@ date: 2020-05-26T20:57:28+03:00
draft: false
pre: ' '
weight: 4
-tags: ["setup", "docker", "linux", "windows"]
+tags: ["setup", "docker", "linux", "windows"]
---
## Deployment
From a842ac2c996d87af5fd792350fdb96e8a92ca13f Mon Sep 17 00:00:00 2001
From: Mike Salvatore
Date: Wed, 27 Jan 2021 13:24:46 -0500
Subject: [PATCH 35/36] docs: small changes to vmware setup guide
---
docs/content/setup/vmware.md | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/docs/content/setup/vmware.md b/docs/content/setup/vmware.md
index 5bb2ffb51..21522f820 100644
--- a/docs/content/setup/vmware.md
+++ b/docs/content/setup/vmware.md
@@ -4,24 +4,31 @@ date: 2020-05-26T20:57:14+03:00
draft: false
pre: ' '
weight: 3
-tags: ["setup", "vmware"]
+tags: ["setup", "vmware"]
---
## Deployment
-1. Deploy the Infection Monkey OVA by choosing **Deploy OVF Template** and following the wizard instructions. *Note: make sure ports 5000 and 5001 on the machine are accessible for inbound TCP traffic.*
+1. Deploy the Infection Monkey OVA by choosing **Deploy OVF Template** and
+ following the wizard instructions. *Note: make sure ports 5000 and 5001 on
+ the machine are accessible for inbound TCP traffic.*
1. Turn on the Infection Monkey VM.
1. Log in to the machine with the following credentials:
1. Username: **monkeyuser**
1. Password: **Noon.Earth.Always**
-1. It's recommended you change the machine passwords by running the following commands: `sudo passwd monkeyuser`, `sudo passwd root`.
+1. It's recommended you change the machine passwords by running the following
+ commands: `sudo passwd monkeyuser`, `sudo passwd root`.
## OVA network modes
You can use the OVA in one of two modes:
-1. In a network with the DHCP configured — In this case, the Monkey Island will automatically query and receive an IP address from the network.
-1. With a static IP address — In this case, you should log in to the VM console with the username `root` and the password `G3aJ9szrvkxTmfAG`. After logging in, edit the interfaces file by entering the following command in the prompt:
+1. In a network with the DHCP configured — In this case, the Monkey Island will
+ automatically query and receive an IP address from the network.
+1. With a static IP address — In this case, you should log in to the VM console
+ with the username `root` and the password `G3aJ9szrvkxTmfAG`. After logging
+ in, edit the interfaces file by entering the following command in the
+ prompt:
```sh
sudo nano /etc/network/interfaces
From 60b3ed78b51f3049ca9eb3a66425309864dfede6 Mon Sep 17 00:00:00 2001
From: Mike Salvatore
Date: Wed, 27 Jan 2021 13:26:01 -0500
Subject: [PATCH 36/36] docs: small changes to windows setup guide
---
docs/content/setup/windows.md | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/docs/content/setup/windows.md b/docs/content/setup/windows.md
index 9b22b87dc..d1ce0d43c 100644
--- a/docs/content/setup/windows.md
+++ b/docs/content/setup/windows.md
@@ -20,11 +20,16 @@ After running the installer, the following prompt should appear on the screen:
### Missing Windows update
-The installer requires [Windows update #2999226](https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows). If you're having trouble running the installer, please make sure to install the update via Windows Update or manually from the link above.
+The installer requires [Windows update #2999226](https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows).
+If you're having trouble running the installer, please make sure to install the
+update via Windows Update or manually from the link above.
### Supported browsers
-The Monkey Island supports Chrome (and Chrome-based) browsers. If your Windows server only has Internet Explorer installed, please install Chrome or a similar modern browser. [You can download Google Chrome here](https://www.google.com/chrome/).
+The Monkey Island supports Chrome (and Chrome-based) browsers. If your Windows
+server only has Internet Explorer installed, please install Chrome or a similar
+modern browser. [You can download Google Chrome
+here](https://www.google.com/chrome/).
## Upgrading