diff options
author | tv <tv@krebsco.de> | 2021-11-21 13:44:39 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2021-11-21 13:44:39 +0100 |
commit | e250f858382a1c830a55a7243a80e1fbd2d1b15d (patch) | |
tree | 0dd30c66ddc473112f1f1fcbf0c80ad896a38204 /krebs/3modules/krebs/default.nix | |
parent | a752af84bedc24fdc32004a8760532b3206c0421 (diff) | |
parent | b0f39ae34d1f248a4c1b92946a42418779f69490 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/3modules/krebs/default.nix')
-rw-r--r-- | krebs/3modules/krebs/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix index c05409fe..776b893f 100644 --- a/krebs/3modules/krebs/default.nix +++ b/krebs/3modules/krebs/default.nix @@ -39,7 +39,10 @@ in { cores = 4; nets = { shack = { - ip4.addr = "10.42.0.50" ; + ip4 = { + addr = "10.42.0.50" ; + prefix = "10.42.0.0/16"; + }; aliases = [ "filebitch.shack" ]; @@ -105,6 +108,7 @@ in { "go.r" "rss.r" ]; + tinc.port = 0; tinc.pubkey = '' -----BEGIN PUBLIC KEY----- MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9PY6t6P1ytgo8qYL2QDc @@ -157,6 +161,7 @@ in { }; puyak = { ci = true; + cores = 4; nets = { retiolum = { ip4.addr = "10.243.77.2"; @@ -165,6 +170,7 @@ in { "build.puyak.r" "cgit.puyak.r" ]; + tinc.port = 0; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAwwDvaVKSJmAi1fpbsmjLz1DQVTgqnx56GkHKbz5sHwAfPVQej955 |