NGSTACK-1022 lds docs update

docs/source/macos/composer.rst

@@ -14,29 +14,14 @@ find detailed instructions on https://getcomposer.org/download/.
 
 Use the above instructions to download the composer to your machine.
 
-Next step is making sure version 2 is available globally under
-``composer2`` command:
-
-.. code:: console
-
-   cp composer.phar /usr/local/bin/composer2
-
-We also need version 1, as not all projects support version 2 yet:
-
+Don't forget adding composer into a directory on PATH
 .. code:: console
 
-   php composer.phar self-update --1
-
-And now just make sure ``composer`` command is available globally:
-
-.. code:: console
-
-   mv composer.phar /usr/local/bin/composer
+   sudo mv composer.phar /usr/local/bin/composer
 
 That is it!
 
-Now you should be able to run ``composer install`` for projects using
-composer1 and ``composer2 install`` for projects using composer2
+Now you should be able to run ``composer install`` in projects.
 
 2 Aliases
 ---------
@@ -49,37 +34,9 @@ Copy the following into the alias file:
 
 ::
 
-    alias composer561="/usr/local/bin/php56 /usr/local/bin/composer"
-    alias composer562="/usr/local/bin/php56 /usr/local/bin/composer2"
-    alias composer701="/usr/local/bin/php70 /usr/local/bin/composer"
-    alias composer702="/usr/local/bin/php70 /usr/local/bin/composer2"
-    alias composer711="/usr/local/bin/php71 /usr/local/bin/composer"
-    alias composer712="/usr/local/bin/php71 /usr/local/bin/composer2"
-    alias composer721="/usr/local/bin/php72 /usr/local/bin/composer"
-    alias composer722="/usr/local/bin/php72 /usr/local/bin/composer2"
-    alias composer731="/usr/local/bin/php73 /usr/local/bin/composer"
-    alias composer732="/usr/local/bin/php73 /usr/local/bin/composer2"
-    alias composer741="/usr/local/bin/php74 /usr/local/bin/composer"
-    alias composer742="/usr/local/bin/php74 /usr/local/bin/composer2"
-    alias composer801="/usr/local/bin/php80 /usr/local/bin/composer"
-    alias composer802="/usr/local/bin/php80 /usr/local/bin/composer2"
-    alias composer811="/usr/local/bin/php81 /usr/local/bin/composer"
-    alias composer812="/usr/local/bin/php81 /usr/local/bin/composer2"
-
-3 Manual upgrade/downgrade
---------------------------
-
-If you do not wish to use aliases, but manually upgrade/downgrade
-composer, you can switch with the following commands:
-
-Switch to version 1:
-
-.. code:: console
-
-   composer self-update --1
-
-Switch to version 2:
-
-.. code:: console
-
-   composer self-update --2
+    alias composer74="/usr/local/bin/php74 /usr/local/bin/composer"
+    alias composer80="/usr/local/bin/php80 /usr/local/bin/composer"
+    alias composer81="/usr/local/bin/php81 /usr/local/bin/composer"
+    alias composer82="/usr/local/bin/php81 /usr/local/bin/composer"
+    alias composer83="/usr/local/bin/php81 /usr/local/bin/composer"
+    alias composer84="/usr/local/bin/php81 /usr/local/bin/composer"

docs/source/macos/curl.rst

@@ -35,8 +35,12 @@ You should receive an output similar to:
    )
 
 The value of ``default_cert_file`` key from above is the location of the
-bundle where the RCA certificates are stored. Add your own RCA
-certificate to the bundle with:
+bundle where the RCA certificates are stored.
+
+**Note**: The ``default_cert_file path`` on your system may differ from the example above.
+Make sure to use the ``default_cert_file`` value from your output in the command below.
+
+Add your own RCA certificate to the bundle with:
 
 .. code:: console
 

docs/source/macos/dnsmasq.rst

@@ -94,17 +94,7 @@ This will also start the server automatically after a reboot.
 
 This will also start the service automatically after a reboot.
 
-4 Update network connections
-----------------------------
-
-Open Network configuration in System Preferences, click Advanced on your
-network connection, select DNS tab and add ``127.0.0.1`` as a DNS
-server.
-
-Repeat this with all network connections you are using to connect to the
-Internet, excluding VPN connections.
-
-5 Test
+4 Test
 ------
 
 Test resolving by pinging a bogus domain on your custom top-level

docs/source/macos/haproxy.rst

@@ -83,6 +83,8 @@ Create configuration file ``/opt/local/etc/haproxy/haproxy.cfg`` with the follow
 
 Make sure to adapt the paths to certificate chain file on your system.
 
+Also, ensure the file ends with a trailing newline (LF), otherwise HAProxy may fail to start.
+
 Create port map file ``/opt/local/etc/haproxy/node_domains_ports.map`` with the following content:
 
 .. code:: console

docs/source/macos/nginx.rst

@@ -63,7 +63,7 @@ configurations:
 Paths in the copied configuration files are already correct for macOS
 using MacPorts, so no adjustments are needed.
 
-To finish this step set permissions on the log directory:
+To finish this step set permissions on the log directory (don't forget to change the user):
 
 .. code:: console
 
@@ -176,7 +176,7 @@ to generate it first:
 
    sudo mkdir /var/www
 
-Then we need to set the permissions on this directory:
+Then we need to set the permissions on this directory  (don't forget to change the user):
 
 .. code:: console
 
@@ -205,7 +205,7 @@ used to serve the website.
    Before configuring HAProxy (in the next section) you will be able to
    access the websites only through ports ``8080`` (HTTP) and ``8443``
    (HTTPS). After configuring HAProxy, you will be able to access them
-   though default ports ``80`` and ``443``.
+   through default ports ``80`` and ``443``.
 
 Testing your website on a different device
 ------------------------------------------
@@ -214,14 +214,14 @@ This setup works with multiple custom local domains, which is not
 trivial to directly expose on a local network, since it would need to
 involve a DNS server.
 
-However, is possible to expose a specific website on your local IP,
+However, it is possible to expose a specific website on your local IP,
 which you can then use to open the website on a different device
 connected to your local network, for example smartphone or a tablet. To
 do that, uncomment the configuration block found in:
 
 ::
 
-   /usr/local/etc/nginx/sites-enabled/local_network_proxy
+   /opt/local/etc/nginx/sites-enabled/local_network_proxy
 
 Then adjust the IP and local website address as needed.
 

docs/source/macos/nodejs.rst

@@ -13,14 +13,17 @@ since the `Netgen Media Site` Makefile is configured to be used with that one.
 First uninstall Node.js, as it will conflict with the versions installed
 through the version manager.
 
+1.1 Install via github
+^^^^^^^^^^^^^^^^^^^^^^
+
 The installation should be fairly straightforward if you follow the instructions at
 `Github <https://github.com/nvm-sh/nvm#install--update-script>`_:
 
 .. code:: console
 
     curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
 
-Make sure to check the correct version, please do not just copy the link above as
+Make sure to **check the correct version**, please do not just copy the link above as
 it could be an old/deprecated version.
 
 This will install the ``nvm`` to ``~/.nvm`` folder, and attempt to modify your profile file
@@ -32,10 +35,9 @@ If you have any other profile file, please add the following to the file your se
     export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
 
-Alternatively, you can install ``nvm`` through one of the package managers:
-
-* Brew: https://formulae.brew.sh/formula/nvm
-* MacPorts: https://ports.macports.org/port/nvm/
+1.2 Install via MacPorts
+^^^^^^^^^^^^^^^^^^^^^^^^
+Find the port here: https://ports.macports.org/port/nvm/.
 
 MacPorts needs some additional steps:
 
@@ -55,6 +57,9 @@ In this ``init-nvm.sh`` there should be:
     [ -e "$NVM_DIR/nvm.sh" ] || ln -s /opt/local/share/nvm/nvm.sh "$NVM_DIR/nvm.sh"
     [ -e "$NVM_DIR/nvm-exec" ] || ln -s /opt/local/share/nvm/nvm-exec "$NVM_DIR/nvm-exec"
 
+1.3 Install via Homebrew
+^^^^^^^^^^^^^^^^^^^^^^^^
+Follow the instructions here: https://formulae.brew.sh/formula/nvm.
 
 Troubleshooting
 ~~~~~~~~~~~~~~~