Merge branch 'develop' into 'production'
merge develop into production See merge request !264
Showing
- DEPLOYMENT-NOTES.rst 4 additions, 4 deletionsDEPLOYMENT-NOTES.rst
- README.rst 1 addition, 1 deletionREADME.rst
- ci-tools/known_hosts.staging 1 addition, 1 deletionci-tools/known_hosts.staging
- default.nix 6 additions, 1 deletiondefault.nix
- docs/dev/README.rst 2 additions, 2 deletionsdocs/dev/README.rst
- morph/README.rst 6 additions, 0 deletionsmorph/README.rst
- morph/default.nix 32 additions, 0 deletionsmorph/default.nix
- morph/grid/local/Vagrantfile 10 additions, 5 deletionsmorph/grid/local/Vagrantfile
- morph/grid/local/config.json 1 addition, 1 deletionmorph/grid/local/config.json
- morph/grid/local/grid.nix 27 additions, 34 deletionsmorph/grid/local/grid.nix
- morph/grid/local/public-keys/users.nix.example 9 additions, 4 deletionsmorph/grid/local/public-keys/users.nix.example
- morph/grid/production/config.json 3 additions, 6 deletionsmorph/grid/production/config.json
- morph/grid/production/grid.nix 33 additions, 56 deletionsmorph/grid/production/grid.nix
- morph/grid/production/public-keys/users.nix 6 additions, 2 deletionsmorph/grid/production/public-keys/users.nix
- morph/grid/testing/config.json 0 additions, 1 deletionmorph/grid/testing/config.json
- morph/grid/testing/grid.nix 24 additions, 25 deletionsmorph/grid/testing/grid.nix
- morph/grid/testing/public-keys/users.nix 2 additions, 2 deletionsmorph/grid/testing/public-keys/users.nix
- morph/lib/base.nix 23 additions, 1 deletionmorph/lib/base.nix
- morph/lib/bootstrap-configuration.nix 1 addition, 1 deletionmorph/lib/bootstrap-configuration.nix
- morph/lib/customize-issuer.nix 0 additions, 53 deletionsmorph/lib/customize-issuer.nix
Loading
Please register or sign in to comment