diff options
| author | makefu <github@syntax-fehler.de> | 2016-03-20 00:03:52 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-03-20 00:03:52 +0100 |
| commit | a8c76186998c6ae0c10f948aef6a32567871ae44 (patch) | |
| tree | 678a1d5019392418fb67d69b0363bf1c450898d9 /krebs | |
| parent | 90ef4d08a13c24456f98d0aab6b55b8c16c89d0b (diff) | |
| parent | fda0262111283afa198510730af8c251886abd4a (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/lass/default.nix | 1 | ||||
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index eb54ba09..3d54900e 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -133,6 +133,7 @@ with config.krebs.lib; ''; }; }; + ssh.pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRyEogeejET/UlqYYzrla3W2xG771oLK8uTFsVlVQFes4/c++Pp3KryJ/+avb/FQGlUb5YTO2SViZyAPTyw3Anv/8wxryB6ExDcfiiPL9D4Kgk559Gc1C+8vJu3Se3zB9huefllhdwsVkeFrInyWRarH3LNSbBq1TH2Rw/T4wyDVILu/QFxyqECdNzi6sufQ/92rEi3oDqlMbS8f45nbVm9CJpdn7ATwLW1PoBrrYkGll3P7ggOmR45rgldTVCLq3rIrIooiOaOhY1Leq+/sBeDa7fVeRFxFaLGYb9KFjQ4x2kL+3dDv0r726wKhrMQX75g/+Hqkv2di4/AGETI71b"; }; cloudkrebs = { cores = 1; diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 257a8393..b0428084 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -32,7 +32,7 @@ with config.krebs.lib; nets = { retiolum = { addrs4 = ["10.243.0.84"]; - addrs6 = ["42:ff6b:5f0b:460d:2cee:4d05:73f7:5566/128"]; + addrs6 = ["42:ff6b:5f0b:460d:2cee:4d05:73f7:5566"]; aliases = [ "darth.retiolum" "darth.r" @@ -383,7 +383,7 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB nets = { retiolum = { addrs4 = ["10.243.231.219"]; - addrs6 = ["42:f7bf:178d:4b68:1c1b:42e8:6b27:6a72/128"]; + addrs6 = ["42:f7bf:178d:4b68:1c1b:42e8:6b27:6a72"]; aliases = [ "nukular.r" ]; |