Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

PrivateStorageio
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

203ac00d

Commit 203ac00d authored 3 years ago by Florian Sesser

Downloads
- Plain Diff

Merge remote-tracking branch 'whetstone/develop' into 363.monitor-tls-cert-expiry

parents 6dc914cc bf98848f

No related branches found

No related tags found

2 merge requests!228merge develop into production,!201Monitor TLS cert expiry

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

docs/dev/README.rst 1 addition, 1 deletion

docs/dev/README.rst
nixos/modules/monitoring/server/grafana-dashboards/meta-monitoring.json 1 addition, 1 deletion

...monitoring/server/grafana-dashboards/meta-monitoring.json
nixos/pkgs/default.nix 3 additions, 15 deletions

nixos/pkgs/default.nix
nixos/pkgs/privatestorage/default.nix 8 additions, 0 deletions

nixos/pkgs/privatestorage/default.nix
nixos/pkgs/privatestorage/repo.json 8 additions, 0 deletions

nixos/pkgs/privatestorage/repo.json
nixos/tests/private-storage.nix 13 additions, 13 deletions

nixos/tests/private-storage.nix
nixpkgs-2105.json 5 additions, 5 deletions

nixpkgs-2105.json
nixpkgs-ps.json 0 additions, 4 deletions

nixpkgs-ps.json
nixpkgs-ps.nix 0 additions, 1 deletion

nixpkgs-ps.nix
tools/update-github-repo 0 additions, 0 deletions

tools/update-github-repo

with 39 additions and 40 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment