From 211350588989902f041f715bf9798afcc19b66ff Mon Sep 17 00:00:00 2001 From: Florian Sesser <florian@privatestorage.io> Date: Wed, 9 Jun 2021 14:01:18 +0000 Subject: [PATCH] README: Fix numbering and some text cosmetics --- morph/grid/local/README.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/morph/grid/local/README.rst b/morph/grid/local/README.rst index 6f74fd36..73bfbbdd 100644 --- a/morph/grid/local/README.rst +++ b/morph/grid/local/README.rst @@ -9,36 +9,36 @@ Issues with networking that looked like guest misconfigurations vanished after c Use the local development environment ````````````````````````````````````` -0. Enter the morph local grid directory:: +1. Enter the morph local grid directory:: cd morph/grid/local -1. Enter the project's nix-shell:: +2. Enter the project's nix-shell:: nix-shell ../../../shell.nix -2. Build and start the VMs:: +3. Build and start the VMs:: VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up -3. Then, add the Vagrant SSH configuration to your user's ``~/.ssh/config`` file:: +4. Then, add the Vagrant SSH configuration to your user's ``~/.ssh/config`` file:: install -d ~/.ssh ; vagrant ssh-config >> ~/.ssh/config -4. Edit the generated configuration: Add the ``publicIP`` addresses from ``grid.nix`` to ssh config **Host** match blocks (**not** HostName) so the ``Host`` lines all read like:: +5. Edit the generated configuration: Add the ``publicIP`` addresses from ``grid.nix`` to ssh config **Host** match blocks (**not** HostName) so the ``Host`` lines all read like:: Host payments1 192.168.67.21 HostName 127.0.0.1 User vagrant [...] -From version 1.5.0 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>`_, so in the future this will get a bit more convenient. + Latest 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>`_), so in the future this should get a bit more convenient. -5. Add your SSH key to ``users.nix`` so you'll be able to log in after deploying the new configuration:: +6. Add your SSH key to ``users.nix`` so you'll be able to log in after deploying the new configuration:: $EDITOR secrets/users.nix -5. Then, build and deploy our software to the Vagrant VMs:: +7. Then, build and deploy our software to the Vagrant VMs:: morph build grid.nix morph push grid.nix -- GitLab