Merge branch 'develop' into 'staging'
Merge develop into staging See merge request !118
Showing
- .gitlab-ci.yml 2 additions, 2 deletions.gitlab-ci.yml
- ci-tools/count-vulnerabilities 2 additions, 1 deletionci-tools/count-vulnerabilities
- docs.nix 2 additions, 14 deletionsdocs.nix
- docs/source/ops/generating-keys.rst 4 additions, 19 deletionsdocs/source/ops/generating-keys.rst
- morph/README.rst 37 additions, 3 deletionsmorph/README.rst
- morph/grid/local/README.rst 1 addition, 9 deletionsmorph/grid/local/README.rst
- morph/grid/local/Vagrantfile 5 additions, 6 deletionsmorph/grid/local/Vagrantfile
- morph/grid/local/config.json 4 additions, 4 deletionsmorph/grid/local/config.json
- morph/grid/local/grid.nix 68 additions, 56 deletionsmorph/grid/local/grid.nix
- morph/grid/local/private-keys/monitoringvpn/172.23.23.11.key 0 additions, 0 deletionsmorph/grid/local/private-keys/monitoringvpn/172.23.23.11.key
- morph/grid/local/private-keys/monitoringvpn/172.23.23.12.key 0 additions, 0 deletionsmorph/grid/local/private-keys/monitoringvpn/172.23.23.12.key
- morph/grid/local/private-keys/monitoringvpn/172.23.23.13.key 0 additions, 0 deletionsmorph/grid/local/private-keys/monitoringvpn/172.23.23.13.key
- morph/grid/local/private-keys/monitoringvpn/preshared.key 0 additions, 0 deletionsmorph/grid/local/private-keys/monitoringvpn/preshared.key
- morph/grid/local/private-keys/monitoringvpn/server.key 0 additions, 0 deletionsmorph/grid/local/private-keys/monitoringvpn/server.key
- morph/grid/local/private-keys/payments-localdev-ssl/cert.pem 0 additions, 0 deletionsmorph/grid/local/private-keys/payments-localdev-ssl/cert.pem
- morph/grid/local/private-keys/payments-localdev-ssl/chain.pem 0 additions, 0 deletions...h/grid/local/private-keys/payments-localdev-ssl/chain.pem
- morph/grid/local/private-keys/payments-localdev-ssl/privkey.pem 0 additions, 0 deletions...grid/local/private-keys/payments-localdev-ssl/privkey.pem
- morph/grid/local/private-keys/ristretto.signing-key 0 additions, 0 deletionsmorph/grid/local/private-keys/ristretto.signing-key
- morph/grid/local/private-keys/stripe.secret 0 additions, 0 deletionsmorph/grid/local/private-keys/stripe.secret
- morph/grid/local/public-keys/monitoringvpn/172.23.23.11.pub 0 additions, 0 deletionsmorph/grid/local/public-keys/monitoringvpn/172.23.23.11.pub
Loading
Please register or sign in to comment