From 82d7e8b918d904e55bb5470c8165ba334ce038aa Mon Sep 17 00:00:00 2001 From: Florian Sesser <florian@privatestorage.io> Date: Thu, 13 May 2021 14:06:26 +0000 Subject: [PATCH] README: add numbering as per @jcalderone's suggestion --- morph/grid/local/README.rst | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/morph/grid/local/README.rst b/morph/grid/local/README.rst index bddc44f0..85632dcf 100644 --- a/morph/grid/local/README.rst +++ b/morph/grid/local/README.rst @@ -36,31 +36,32 @@ If you run an older Nixpkgs, retrieve and use the latest Vagrant development ver Use the local development environment ````````````````````````````````````` -Build and start the VMs:: +1. Build and start the VMs:: - VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up + VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up -Then, once:: +2. Then, once:: - vagrant ssh-config > ./vagrant-ssh-config + vagrant ssh-config > ./vagrant-ssh-config -Add the IPs from ``grid.nix`` to the vagrant-ssh-config Host match blocks so the config reads like:: +3. Edit the output: Add the IPs from ``grid.nix`` to the ``vagrant-ssh-config`` **Host match blocks** so the config reads like:: - Host payments1 192.168.67.21 - HostName 192.168.67.21 - User vagrant - [...] + Host payments1 192.168.67.21 + HostName 192.168.67.21 + User vagrant + [...] -Then, make morph use this ssh config either - with newer morph [#]_ - by pointing it to it:: +4. Then, make morph use this ssh config either - with newer morph [#]_ - by pointing it to it:: - export SSH_CONFIG_FILE=./vagrant-ssh-config + export SSH_CONFIG_FILE=./vagrant-ssh-config -Or, with older morph, adding the config to your user's ``~/.ssh/config`` file. + Or, with older morph, adding the config to your user's ``~/.ssh/config`` file. -Then, build and deploy our software to the Vagrant VMs:: + .. [#] Morph honors the ``SSH_CONFIG_FILE`` environment variable `since 3f90aa88 (March 2020, v 1.5.0) <https://github.com/DBCDK/morph/commit/3f90aa885fac1c29fce9242452fa7c0c505744ef#diff-d155ad793bd62e6ea4c44ba985049ecb13a4f4f32f799791b2bce695a16c0101>`_. - morph build grid.nix - morph push grid.nix - morph deploy grid.nix switch +5. Then, build and deploy our software to the Vagrant VMs:: + + morph build grid.nix + morph push grid.nix + morph deploy grid.nix switch -.. [#] Morph honors the ``SSH_CONFIG_FILE`` environment variable `since 3f90aa88 (March 2020, v 1.5.0) <https://github.com/DBCDK/morph/commit/3f90aa885fac1c29fce9242452fa7c0c505744ef#diff-d155ad793bd62e6ea4c44ba985049ecb13a4f4f32f799791b2bce695a16c0101>`_. -- GitLab