From e197008c2f4357681914d461f7dbaa27285a67a7 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Wed, 24 Mar 2021 14:37:14 -0400 Subject: [PATCH 1/2] docs: update vmware OVA static IP configuration instructions for v1.9.0 --- docs/content/setup/vmware.md | 54 +++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/docs/content/setup/vmware.md b/docs/content/setup/vmware.md index 21522f8201d..17eadd33182 100644 --- a/docs/content/setup/vmware.md +++ b/docs/content/setup/vmware.md @@ -16,8 +16,9 @@ tags: ["setup", "vmware"] 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. For security purposes, it's recommended that you change the machine + passwords by running the following commands: `sudo passwd monkeyuser`, `sudo + passwd root`. ## OVA network modes @@ -26,37 +27,50 @@ 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 + with the username `monkeyuser` and the password `Noon.Earth.Always`. After logging + in, edit the Netplan configuration by entering the following command in the prompt: ```sh - sudo nano /etc/network/interfaces + sudo nano /etc/netplan/50-cloud-init.yaml ``` - Change the lines: - - ```sh - auto ens160 - iface ens160 inet dhcp + Make the following changes: + + ```diff + # This file is generated from information provided by + # the datasource. Changes to it will not persist across an instance. + # To disable cloud-init's network configuration capabilities, write a file + # /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg with the following: + # network: {config: disabled} + network: + version: 2 + ethernets: + ens192: + - dhcp4: true + - dhcp-identifier: mac + + dhcp4: false + + addresses: [XXX.XXX.XXX.XXX/24] + + gateway4: YYY.YYY.YYY.YYY + nameservers: + search: [gc.guardicore.com] + - addresses: [10.0.0.8, 10.0.0.5] + + addresses: [1.1.1.1] ``` - to the following: - - ```sh - auto ens160 - iface ens160 inet static - address AAA.BBB.CCC.DDD - netmask XXX.XXX.XXX.XXX - gateway YYY.YYY.YYY.YYY - ``` + Replace `XXX.XXX.XXX.XXX` with the desired IP addess of the VM. Replace + `YYY.YYY.YYY.YYY` with the default gateway. Save the changes then run the command: ```sh - sudo ifdown ens160 && ifup ens160 + sudo netplan apply ``` + If this configuration does not suit your needs, see + https://netplan.io/examples/ for more information about how to configure + Netplan. + ## Upgrading Currently, there's no "upgrade-in-place" option when a new version is released. From 5d68bc6e1de4e3a040bb5ec04c8269c00bab4d49 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Fri, 26 Mar 2021 12:23:43 -0400 Subject: [PATCH 2/2] docs: update vmware OVA static IP configuration instructions for v1.10.0 --- docs/content/setup/vmware.md | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/docs/content/setup/vmware.md b/docs/content/setup/vmware.md index 17eadd33182..c6519672ba6 100644 --- a/docs/content/setup/vmware.md +++ b/docs/content/setup/vmware.md @@ -32,30 +32,23 @@ You can use the OVA in one of two modes: prompt: ```sh - sudo nano /etc/netplan/50-cloud-init.yaml + sudo nano /etc/netplan/00-installer-config.yaml ``` Make the following changes: ```diff - # This file is generated from information provided by - # the datasource. Changes to it will not persist across an instance. - # To disable cloud-init's network configuration capabilities, write a file - # /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg with the following: - # network: {config: disabled} - network: - version: 2 - ethernets: - ens192: - - dhcp4: true - - dhcp-identifier: mac - + dhcp4: false - + addresses: [XXX.XXX.XXX.XXX/24] - + gateway4: YYY.YYY.YYY.YYY - nameservers: - search: [gc.guardicore.com] - - addresses: [10.0.0.8, 10.0.0.5] - + addresses: [1.1.1.1] + # This is the network config written by 'subiquity' + network: + ethernets: + ens160: + - dhcp4: true + + dhcp4: false + + addresses: [XXX.XXX.XXX.XXX/24] + + gateway4: YYY.YYY.YYY.YYY + + nameservers: + + addresses: [1.1.1.1] + version: 2 ``` Replace `XXX.XXX.XXX.XXX` with the desired IP addess of the VM. Replace