Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PrivateStorageio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PrivateStorage
PrivateStorageio
Commits
28e524e4
Commit
28e524e4
authored
3 years ago
by
Florian Sesser
Browse files
Options
Downloads
Patches
Plain Diff
So focused on a funny commit message I forgot to add half of the changes
parent
e181c922
No related branches found
Branches containing commit
No related tags found
3 merge requests
!101
Merge staging into production
,
!100
Merge develop into staging
,
!87
Add monitoring VPN modules and config
Pipeline
#657
failed
3 years ago
Stage: build
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
morph/grid/local/grid.nix
+1
-1
1 addition, 1 deletion
morph/grid/local/grid.nix
morph/grid/production/grid.nix
+1
-1
1 addition, 1 deletion
morph/grid/production/grid.nix
morph/grid/testing/grid.nix
+1
-1
1 addition, 1 deletion
morph/grid/testing/grid.nix
with
3 additions
and
3 deletions
morph/grid/local/grid.nix
+
1
−
1
View file @
28e524e4
...
...
@@ -6,7 +6,7 @@ import ../../lib/make-grid.nix {
config
=
./config.json
;
nodes
=
cfg
:
let
sshUsers
=
import
./users.nix
;
sshUsers
=
import
./
secrets/
users.nix
;
vpnClientIPs
=
[
"172.23.23.11"
"172.23.23.12"
"172.23.23.13"
];
# TBD: derive automatically
# Get absolute vpn key directory path, as a string:
monitoringvpnKeyDir
=
toString
./.
+
"/
${
cfg
.
monitoringvpnKeyDir
}
"
;
...
...
This diff is collapsed.
Click to expand it.
morph/grid/production/grid.nix
+
1
−
1
View file @
28e524e4
...
...
@@ -6,7 +6,7 @@ import ../../lib/make-grid.nix {
config
=
./config.json
;
nodes
=
cfg
:
let
sshUsers
=
import
./users.nix
;
sshUsers
=
import
./
secrets/
users.nix
;
in
{
# Here are the hosts that are in this morph network. This is sort of like
# a server manifest. We try to keep as many of the specific details as
...
...
This diff is collapsed.
Click to expand it.
morph/grid/testing/grid.nix
+
1
−
1
View file @
28e524e4
...
...
@@ -6,7 +6,7 @@ import ../../lib/make-grid.nix {
config
=
./config.json
;
nodes
=
cfg
:
let
sshUsers
=
import
./users.nix
;
sshUsers
=
import
./
secrets/
users.nix
;
in
{
"payments"
=
import
../../lib/make-issuer.nix
({
publicIPv4
=
"18.194.183.13"
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment