From 58380c82848c3db0bd6c3d74904153f3464c2098 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 14 Jul 2017 00:17:58 +0200 Subject: merge shared into krebs --- krebs/3modules/default.nix | 2 +- krebs/3modules/krebs/default.nix | 75 +++++++++++++++++++++++++++++++++++++++ krebs/3modules/shared/default.nix | 75 --------------------------------------- 3 files changed, 76 insertions(+), 76 deletions(-) create mode 100644 krebs/3modules/krebs/default.nix delete mode 100644 krebs/3modules/shared/default.nix (limited to 'krebs/3modules') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 081724cfe..6123b6dd9 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -94,10 +94,10 @@ let imp = lib.mkMerge [ { krebs = import ./lass { inherit config; }; } + { krebs = import ./krebs { inherit config; }; } { krebs = import ./makefu { inherit config; }; } { krebs = import ./mv { inherit config; }; } { krebs = import ./nin { inherit config; }; } - { krebs = import ./shared { inherit config; }; } { krebs = import ./tv { inherit config; }; } { krebs.dns.providers = { diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix new file mode 100644 index 000000000..780aeb1cf --- /dev/null +++ b/krebs/3modules/krebs/default.nix @@ -0,0 +1,75 @@ +{ config, ... }: + +with import ; +let + testHosts = genAttrs [ + "test-arch" + "test-centos6" + "test-centos7" + "test-all-krebs-modules" + ] (name: { + owner = config.krebs.users.krebs; + inherit name; + cores = 1; + nets = { + retiolum = { + ip4.addr = "10.243.73.57"; + ip6.addr = "42:0:0:0:0:0:0:7357"; + 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 = { + wolf = { + owner = config.krebs.users.krebs; + nets = { + shack = { + ip4.addr = "10.42.2.150" ; + aliases = [ + "wolf.shack" + "graphite.shack" + "acng.shack" + "drivedroid.shack" + ]; + }; + retiolum = { + ip4.addr = "10.243.77.1"; + ip6.addr = "42:0:0:0:0:0:77:1"; + aliases = [ + "wolf.r" + "build.wolf.r" + "cgit.wolf.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAzpXyEATt8+ElxPq650/fkboEC9RvTWqN6UIAl/R4Zu+uDhAZ2ekb + HBjoSbRxu/0w2I37nwWUhEOemxGm4PXCgWrtO0jeRF4nVNYu3ZBppA3vuVALUWq7 + apxRUEL9FdsWQlXGo4PVd20dGaDTi8M/Ggo755MStVTY0rRLluxyPq6VAa015sNg + 4NOFuWm0NDn4e+qrahTCTiSjbCU8rWixm0GktV40kdg0QAiFbEcRhuXF1s9/yojk + 7JT/nFg6LELjWUSSNZnioj5oSfVbThDRelIld9VaAKBAZZ5/zy6T2XSeDfoepytH + 8aw6itEuTCy1M1DTiTG+12SPPw+ubG+NqQIDAQAB + -----END RSA PUBLIC KEY----- + ''; + }; + }; + ssh.privkey.path = ; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKYMXMWZIK0jjnZDM9INiYAKcwjXs2241vew54K8veCR"; + }; + } // testHosts; + users = { + krebs = { + mail = "spam@krebsco.de"; + pubkey = "lol"; # TODO krebs.users.krebs.pubkey should be unnecessary + }; + }; +} diff --git a/krebs/3modules/shared/default.nix b/krebs/3modules/shared/default.nix deleted file mode 100644 index 17179a39f..000000000 --- a/krebs/3modules/shared/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ config, ... }: - -with import ; -let - testHosts = genAttrs [ - "test-arch" - "test-centos6" - "test-centos7" - "test-all-krebs-modules" - ] (name: { - owner = config.krebs.users.shared; - inherit name; - cores = 1; - nets = { - retiolum = { - ip4.addr = "10.243.73.57"; - ip6.addr = "42:0:0:0:0:0:0:7357"; - 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 = { - wolf = { - owner = config.krebs.users.shared; - nets = { - shack = { - ip4.addr = "10.42.2.150" ; - aliases = [ - "wolf.shack" - "graphite.shack" - "acng.shack" - "drivedroid.shack" - ]; - }; - retiolum = { - ip4.addr = "10.243.77.1"; - ip6.addr = "42:0:0:0:0:0:77:1"; - aliases = [ - "wolf.r" - "build.wolf.r" - "cgit.wolf.r" - ]; - tinc.pubkey = '' - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAzpXyEATt8+ElxPq650/fkboEC9RvTWqN6UIAl/R4Zu+uDhAZ2ekb - HBjoSbRxu/0w2I37nwWUhEOemxGm4PXCgWrtO0jeRF4nVNYu3ZBppA3vuVALUWq7 - apxRUEL9FdsWQlXGo4PVd20dGaDTi8M/Ggo755MStVTY0rRLluxyPq6VAa015sNg - 4NOFuWm0NDn4e+qrahTCTiSjbCU8rWixm0GktV40kdg0QAiFbEcRhuXF1s9/yojk - 7JT/nFg6LELjWUSSNZnioj5oSfVbThDRelIld9VaAKBAZZ5/zy6T2XSeDfoepytH - 8aw6itEuTCy1M1DTiTG+12SPPw+ubG+NqQIDAQAB - -----END RSA PUBLIC KEY----- - ''; - }; - }; - ssh.privkey.path = ; - ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKYMXMWZIK0jjnZDM9INiYAKcwjXs2241vew54K8veCR"; - }; - } // testHosts; - users = { - shared = { - mail = "spam@krebsco.de"; - pubkey = "lol"; # TODO krebs.users.shared.pubkey should be unnecessary - }; - }; -} -- cgit v1.2.3