Merge branch 'develop' into local-dev-env-2

.gitlab-ci.yml

@@ -9,6 +9,11 @@ docs:
   stage: "build"
   script:
     - "nix-shell --run 'nix-build docs.nix'"
+    - "cp --recursive --no-preserve=mode result/docs/. docs/build/"
+  artifacts:
+    paths:
+      - "docs/build/"
+    expose_as: "documentation"
 
 unit-tests:
   stage: "test"

README.rst

@@ -13,7 +13,6 @@ Documentation
 
 There is documentation for:
 
-* Users: ``docs/user/README.rst``
 * Operators/Admins: ``docs/ops/README.rst``
 * Developers: ``docs/dev/README.rst``
 

docs/source/index.rst

@@ -11,7 +11,6 @@ Howdy!  We separated the documentation into parts addressing different audiences
 .. toctree::
    :maxdepth: 2
 
-   Users <user/README>
    Administrators <ops/README>
    Developers <dev/README>
 

docs/source/user/README.rst

-User documentation
-==================
-
-This will contain the user documentation for this project.
-

morph/grid/local/README.rst

@@ -26,17 +26,11 @@ One possible way to do it in NixOS:
 Pre-Vagrant 2.2.16: Get Vagrant with the required fixes for NixOS guests
 ````````````````````````````````````````````````````````````````````````
 
-The Vagrant nixos-guest template `received a critical update on 2021-03-08 <https://github.com/hashicorp/vagrant/commit/990d94ed9d0b3092e855bc1bb9deeeb7aa7792cf>`_ which is going to be in version 2.2.16 once it's out.
+The Vagrant nixos-guest template `received a critical update on 2021-03-08 <https://github.com/hashicorp/vagrant/commit/990d94ed9d0b3092e855bc1bb9deeeb7aa7792cf>`_ which came out with Vagrant version 2.2.16.
 
-Retrieve and use the latest Vagrant development version locally::
+If you run an older Nixpkgs, retrieve and use the latest Vagrant development version like so::
 
-  git clone ssh://git@github.com/hashicorp/vagrant.git
-  cd vagrant/
-  nix-shell -p gcc gnumake git gnutar curl ruby
-  bundle install
-  bundle --binstubs exec
-  cd exec/
-  export PATH=`pwd`:$PATH
+  NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/master.tar.gz nix-shell -p vagrant
 
 
 Use the local development environment
@@ -44,7 +38,7 @@ Use the local development environment
 
 Build and start the VMs::
 
-  vagrant up
+  VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up
 
 Then::