setup - ec2: change to new aws marketplace image

source/manual/how-tos/installaws.rst

@@ -4,20 +4,19 @@ Installing OPNsense AWS image
 .. image:: images/amazon-web-services.png
     :width: 100%
 
-To apply for access to the OPNsense Amazon AWS EC2 cloud image, you need:
+Our EC2 image is available in the `aws marketplace <https://aws.amazon.com/marketplace/pp/prodview-lu5v2tokic3py>`__.
 
-* An active support subscription
-    see: https://opnsense.org/support-overview/commercial-support/)
-* Supply your Amazon Account Number
-    to share the Amazon Machine Image with.
-* The zone or zones you would like to install the image in
-    e.g. eu-central-1, us-east-1
 
 ---------------------
 Step 1 - New Instance
 ---------------------
-Start a new instance and then go to "instances", followed by "launch instance"
-and then "My AMIs", don't forget to select "Shared with me"
+
+To start a new instance go to "instances", followed by "launch instance" in your EC2 view.
+
+Next go to "AWS Marketplace" and search "OPNsense". Our official image is sold via Deciso Sales B.V..
+
+.. image:: images/aws_step1_choose_ami.png
+    :width: 100%
 
 
 --------------------
@@ -28,67 +27,140 @@ Choose an instance type
 .. image:: images/aws_launch_new_image.png
     :width: 100%
 
----------------------------------
-Step 3 - Configure security group
----------------------------------
-To configure security group, make sure you allow HTTPS access from your own network.
+------------------------------------
+Step 3 - Configure Instance Details
+------------------------------------
 
-.. image:: images/aws_configure_security_group.png
-    :width: 100%
+Here you can configure your network details, by default a network is assigned which is accesible from an external IPv4
+address.
+
+At the bottom of the page you can also supply "User data" in the "Advanced Details" section, you can use this to
+set an initial password for the `ec2-user`.
+
+.. Note::
+
+    When a password is omited, one will be automatically generated for you and displayed on the console (get system log).
+
+
+.. Note:
+
+    To supply a default password, use the following format `password=mypassword` after which the `ec2-user` can login with `mypassword`.
 
 
 -------------------------
-Step 4 - Configure a disk
+Step 4 - Add Storage
 -------------------------
 
-.. image:: images/aws_choose_disc.png
-    :width: 100%
+Here you can change the initial storage size and type of volume to use.
+
+
+-------------------------
+Step 5 - Add Tags
+-------------------------
+
+Optionally you may add tags to the instance, it's safe to leave this empty.
+
+---------------------------------
+Step 6 - Configure security group
+---------------------------------
+To configure security group, make sure you allow HTTPS access from your own network.
+Since SSH is also enabled by default on these images, you may enable port 22 (SSH) too from your network.
 
+.. image:: images/aws_configure_security_group.png
+    :width: 100%
 
 -----------------------------
-Step 5 - Review your settings
+Step 7 - Review your settings
 -----------------------------
 
 .. image:: images/aws_review_settings.png
     :width: 100%
 
 --------------------
-Step 6 - SSH keypair
+Step 8 - SSH keypair
 --------------------
-Select ssh keypair or skip, the ssh key isn’t used for OPNsense, ssh is disabled by default.
+Select ssh keypair or skip, the selected ssh key is attached to the `ec2-user`, you can change this afterwards
+from the usermanager. (:menuselection:`System -> Access -> Users`).
 
 .. image:: images/aws_ssh_keypair.png
     :width: 100%
 
 ---------------------------
-Step 7 - Review status page
+Step 9 - Review status page
 ---------------------------
 
 .. image:: images/aws_status.png
     :width: 100%
 
-----------------------
-Step 8 - AWS instances
-----------------------
+-------------------------
+Step 10 - AWS instances
+-------------------------
 Go to your AWS instances
 
 .. image:: images/aws_instances.png
     :width: 100%
 
 Select the image, go to “image settings” then “get system log” to obtain the
-initial password
+initial password for the `ec2-user` (if not specified in the user data) and the initial root password.
+
+.. Note::
+
+    Sometimes it can take a bit of time before the console settings appear in the "system log", in our experience
+    the output is available when the `Status check` reports it's finished.
 
-------------------------------
-Step 9 - Initial root password
-------------------------------
+---------------------------------
+Step 11 - Initial root password
+---------------------------------
 Copy your initial root password (line ** set initial….)
 
-.. image:: images/aws_capture_initial_password.png
-    :width: 100%
 
---------------------------------
-Step 10 - Search current address
---------------------------------
+.. code-block::
+
+    .....
+    Configuring system logging...done.
+    >>> Invoking start script 'aws'
+    **********************************************************************************************************
+    *** set initial ec2-user password to : J4heQUAaRWJFGkXrfUKssjQ9jyFiBmaRgqaBiYRK7iiL2lUtvG
+    *** !!! remember to change this immediately
+    *** openssh-key provided, set to ec2-user
+    *** set initial root password to : SNFpd2lcefYXXjyRezPrloTWTF3LjhgZPV3zLuDxEdVkiBGWxn
+    *** remember to change this immediately
+    **********************************************************************************************************
+    >>> Invoking start script 'newwanip'
+    Reconfiguring IPv4 on xn0: OK
+    Reconfiguring routes: OK
+    >>> Invoking start script 'freebsd'
+    >>> Invoking start script 'syslog-ng'
+    Stopping syslog_ng.
+    Waiting for PIDS: 57924.
+    Starting syslog_ng.
+    >>> Invoking start script 'carp'
+    >>> Invoking start script 'cron'
+    Starting Cron: OK
+    >>> Invoking start script 'beep'
+    Root file system: /dev/gpt/rootfs
+    Sat Feb  5 17:58:45 UTC 2022
+
+    *** OPNsense.localdomain: OPNsense 21.7.7 (amd64/OpenSSL) ***
+
+     WAN (xn0)       -> v4/DHCP4: 172.31.27.130/20
+
+     HTTPS: SHA256 52 87 3F 28 48 59 A3 7D 59 66 26 36 01 2C 77 61
+                   FB 8E 78 C8 C4 C4 80 2C 97 C6 67 AA CB 28 48 60
+     SSH:   SHA256 pwupAQ6U+TOKoI1NAvcFpKF90Is02W0YMem7CNPG9j8 (ECDSA)
+     SSH:   SHA256 +JOMcgZ14lUnUxp4jEbEWf7Q+OvHJufvjhFzybJG1/M (ED25519)
+     SSH:   SHA256 2mR9csHFwDgBl7SGfOPeW2r9E15zMP9OuMpHnBrGwUI (RSA)
+
+
+    FreeBSD/amd64 (OPNsense.localdomain) (ttyu0)
+
+
+
+    login:
+
+--------------------------------------------
+Step 11 - Search current address and login
+--------------------------------------------
 
 .. image:: images/aws_search_current_ip.png
     :width: 100%

source/manual/virtuals.rst

@@ -97,9 +97,7 @@ Amazon AWS EC2 Cloud
     :height: 80px
 
 Installing OPNsense into the Amazon cloud can be a dounting task as no console is
-offered. As part of Deciso's support packages (see `OPNsense commercial Support
-<https://opnsense.org/support-overview/commercial-support/>`__), Deciso offer free
-access to its OPNsense Amazon Machine Image (AMI).
+offered. Luckily an easy to install AMI is also available in the aws marketplace.
 
 See also our how-to for :doc:`how-tos/installaws`.