diff options
| author | makefu <github@syntax-fehler.de> | 2015-11-14 01:51:36 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-11-14 01:51:36 +0100 |
| commit | 773a67a983cbe1928da6c524db24a25229a6f5fe (patch) | |
| tree | 2a00ed5a39f85b837578625cf49d193f4d308f14 /krebs/3modules/lass | |
| parent | a0fbe917ac45cda4de0f16bced3ce3ebfc556fe8 (diff) | |
| parent | e7d22252dcad25fd5594e9a431f5a39aa620906d (diff) | |
Merge remote-tracking branch 'cloudkrebs/master' into pre-merge
Diffstat (limited to 'krebs/3modules/lass')
| -rw-r--r-- | krebs/3modules/lass/default.nix | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 2ad4353bd..c99263fe8 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -2,35 +2,7 @@ with lib; -let - testHosts = lib.genAttrs [ - "test-arch" - "test-centos6" - "test-centos7" - ] (name: { - inherit name; - cores = 1; - nets = { - retiolum = { - addrs4 = ["10.243.111.111"]; - addrs6 = ["42:0:0:0:0:0:0:7357"]; - aliases = [ - "test.retiolum" - ]; - tinc.pubkey = '' - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAy41YKF/wpHLnN370MSdnAo63QUW30aw+6O79cnaJyxoL6ZQkk4Nd - mrX2tBIfb2hhhgm4Jecy33WVymoEL7EiRZ6gshJaYwte51Jnrac6IFQyiRGMqHY5 - TG/6IzzTOkeQrT1fw3Yfh0NRfqLBZLr0nAFoqgzIVRxvy+QO1gCU2UDKkQ/y5df1 - K+YsMipxU08dsOkPkmLdC/+vDaZiEdYljIS3Omd+ED5JmLM3MSs/ZPQ8xjkjEAy8 - QqD9/67bDoeXyg1ZxED2n0+aRKtU/CK/66Li//yev6yv38OQSEM4t/V0dr9sjLcY - VIdkxKf96F9r3vcDf/9xw2HrqVoy+D5XYQIDAQAB - -----END RSA PUBLIC KEY----- - ''; - }; - }; - }); -in { +{ hosts = addNames { echelon = { cores = 2; @@ -241,7 +213,7 @@ in { }; }; - } // testHosts; + }; users = addNames { lass = { pubkey = readFile ../../Zpubkeys/lass.ssh.pub; |