diff options
author | lassulus <lass@lassul.us> | 2017-06-15 21:13:46 +0200 |
---|---|---|
committer | lassulus <lass@lassul.us> | 2017-06-15 21:13:46 +0200 |
commit | c6605a3ab8f6a5098bbd3e011de50e37bf242a05 (patch) | |
tree | 57a0868c0dbe34aa553c5175c2f3ab29add0a330 /krebs | |
parent | fde07d4e5ed92309ca1c7570c936ec3d324ca2f3 (diff) | |
parent | 70260c70943cfcad80c268920566c1a858870b28 (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs')
-rw-r--r-- | krebs/3modules/makefu/default.nix | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index c95e1761c..7f8907c5b 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -782,6 +782,29 @@ with import <stockholm/lib>; }; }; + horisa = rec { + cores = 2; + nets = { + retiolum = { + ip4.addr = "10.243.226.213"; + ip6.addr = "42:432e:2379:0cd2:8486:f3b5:335a:5d83"; + aliases = [ + "horisa.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEA1hhBqCku98gimv0yXr6DFwE2HUemigyqX8o7IsPOW5XT/K8o+V40 + Oxk3r0+c7IYREvug/raxoullf5TMJFzTzqzX4njgsiTs25V8D7hVT4jcRKTcXmBn + XpjtD+tIeDW1E6dIMMDbxKCyfd/qaeg83G7gPobeFYr4JNqQLXrnotlWMO9S13UT + +EgSP2pixv/dGIqX8WRg23YumO8jZKbso/sKKFMIEOJvnh/5EcWb24+q2sDRCitP + sWJ5j/9M1Naec/Zl27Ac2HyMWRk39F9Oo+iSbc47QvjKTEmn37P4bBg3hY9FSSFo + M90wG/NRbw1Voz6BgGlwOAoA+Ln0rVKqDQIDAQAB + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; + tahoe = rec { cores = 1; nets = { |