Merge branch 'develop' into 'staging'
Merge develop into staging See merge request !122
Showing
- .gitlab-ci.yml 66 additions, 9 deletions.gitlab-ci.yml
- ci-tools/update-grid-servers 56 additions, 0 deletionsci-tools/update-grid-servers
- ci-tools/vulnerability-scan 1 addition, 1 deletionci-tools/vulnerability-scan
- docs.nix 1 addition, 1 deletiondocs.nix
- morph/grid/local/Vagrantfile 10 additions, 0 deletionsmorph/grid/local/Vagrantfile
- morph/grid/local/config.json 1 addition, 0 deletionsmorph/grid/local/config.json
- morph/grid/local/grid.nix 14 additions, 1 deletionmorph/grid/local/grid.nix
- morph/grid/local/private-keys/deploy_key 7 additions, 0 deletionsmorph/grid/local/private-keys/deploy_key
- morph/grid/local/public-keys/deploy_key.pub 1 addition, 0 deletionsmorph/grid/local/public-keys/deploy_key.pub
- morph/grid/production/config.json 1 addition, 0 deletionsmorph/grid/production/config.json
- morph/grid/production/grid.nix 15 additions, 1 deletionmorph/grid/production/grid.nix
- morph/grid/production/public-keys/deploy_key.pub 1 addition, 0 deletionsmorph/grid/production/public-keys/deploy_key.pub
- morph/grid/testing/config.json 1 addition, 0 deletionsmorph/grid/testing/config.json
- morph/grid/testing/grid.nix 14 additions, 1 deletionmorph/grid/testing/grid.nix
- morph/grid/testing/public-keys/deploy_key.pub 1 addition, 0 deletionsmorph/grid/testing/public-keys/deploy_key.pub
- morph/grid/testing/testing001-hardware.nix 1 addition, 11 deletionsmorph/grid/testing/testing001-hardware.nix
- morph/lib/customize-monitoring.nix 40 additions, 4 deletionsmorph/lib/customize-monitoring.nix
- morph/lib/issuer-aws.nix 6 additions, 1 deletionmorph/lib/issuer-aws.nix
- morph/lib/issuer.nix 3 additions, 0 deletionsmorph/lib/issuer.nix
- morph/lib/monitoring.nix 3 additions, 6 deletionsmorph/lib/monitoring.nix
Loading
Please register or sign in to comment