From 0f2f56097b4a404a1b0b0e52f948bba878c05caa Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Sep 2015 11:56:13 +0200 Subject: krebs 3: add fastpoke --- krebs/3modules/default.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index f0eb290ca..6f7b5c7b9 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -169,6 +169,36 @@ let }; }; }; + fastpoke = { + dc = "lass"; #dc = "cac"; + nets = rec { + internet = { + addrs4 = ["193.22.164.36"]; + aliases = [ + "fastpoke.internet" + ]; + }; + retiolum = { + via = internet; + addrs4 = ["10.243.253.152"]; + addrs6 = ["42:422a:194f:ff3b:e196:2f82:5cf5:bc00"]; + aliases = [ + "fastpoke.retiolum" + "cgit.fastpoke.retiolum" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAs4p5xsQYx06v+OkUbc09K6voFAbkvO66QdFoM71E10XyCeLP6iuq + DaIOFN4GrPR36pgyjqtJ+62G9uR+WsB/y14eio1p1ivDWgcpt5soOZAH5zVRRD9O + FBDlgVNwIJ6stMHy6OenEKWsfEiZRN3XstnqAqyykzjddglth1tJntn6kbZehzNQ + ezfIyN4XgaX2fhSu+UnAyLcV8wWnF9cMABjz7eKcSmRJgtG4ZiuDkbgiiEew7+pB + EPqOVQ80lJvzQKgO4PmVoAjD9A+AHnmLJNPDQQi8nIVilGCT60IX+XT1rt85Zpdy + rEaeriw/qsVJnberAhDAdQYYuM1ai2H5swIDAQAB + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; cloudkrebs = { cores = 1; dc = "lass"; #dc = "cac"; -- cgit v1.2.3 From ceb8226bc453244f8740137b58707b8e32a28c76 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Sep 2015 15:19:31 +0200 Subject: krebs: new key for echelon --- krebs/3modules/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 6f7b5c7b9..a0603cd8c 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -143,7 +143,7 @@ let dc = "lass"; #dc = "cac"; nets = rec { internet = { - addrs4 = ["162.248.8.63"]; + addrs4 = ["104.233.84.57"]; aliases = [ "echelon.internet" ]; @@ -158,12 +158,12 @@ let ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEA92ybhDahtGybpAkUNlG5Elxw05MVY4Pg7yK0dQugB4nVq+pnmi78 - DOMeIciecMHmJM8n9UlUU0eWZVCgHeVd23d6J0hTHCv24p24uHEGGy7XlO/dPJ6A - IjROYU0l8c03pipdJ3cDBx6riArSglwmZJ7xH/Iw0BUhRZrPqbtijY7EcG2wc+8K - N9N9mBofVMl4EcBiDR/eecK+ro8OkeOmYPtYgFJLvxTYXiPIhOxMAlkOY2fpin/t - cgFLUFuN4ag751XjjcNpVovVq95vdg+VhKrrNVWZjJt03owW81BzoryY6CD2kIPq - UxK89zEdeYOUT7AxaT/5V5v41IvGFZxCzwIDAQAB + MIIBCgKCAQEAuscWOYdHu0bpWacvwTNd6bcmrAQ0YFxJWHZF8kPZr+bMKIhnXLkJ + oJheENIM6CA9lQQQFUxh2P2pxZavW5rgVlJxIKeiB+MB4v6ZO60LmZgpCsWGD/dX + MipM2tLtQxYhvLJIJxEBWn3rxIgeEnCtZsH1KLWyLczb+QpvTjMJ4TNh1nEBPE/f + 4LUH1JHaGhcaHl2dLemR9wnnDIjmSj0ENJp2al+hWnIggcA/Zp0e4b86Oqbbs5wA + n++n5j971cTrBdA89nJDYOEtepisglScVRbgLqJG81lDA+n24RWFynn+U3oD/L8p + do+kxlwZUEDRbPU4AO5L+UeIbimsuIfXiQIDAQAB -----END RSA PUBLIC KEY----- ''; }; -- cgit v1.2.3 From bfe0723728ae2d995b99f22fe9783a34889b1828 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 1 Oct 2015 01:48:15 +0200 Subject: move config scripts to krebs --- krebs/3modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 2b4a13c42..d3481505b 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -6,7 +6,7 @@ let out = { imports = [ - ./build + ./build.nix ./exim-retiolum.nix ./exim-smarthost.nix ./github-hosts-sync.nix -- cgit v1.2.3 From 2ef889b1c409ac8d83cabb8d12d564ae5a89d47d Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 1 Oct 2015 14:26:50 +0200 Subject: mkdir: 104.233.84.{174 -> 215} --- krebs/3modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index d3481505b..5e8cdc639 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -530,7 +530,7 @@ let infest.addr = head nets.internet.addrs4; nets = rec { internet = { - addrs4 = ["104.233.84.173"]; + addrs4 = ["104.233.84.215"]; aliases = [ "mkdir.internet" ]; -- cgit v1.2.3 From 24326956780833540fd65dd0cb750c1071fa51b9 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 1 Oct 2015 14:59:58 +0200 Subject: krebs lib.types: deprecate host.infest.{addr,port} --- krebs/3modules/default.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 5e8cdc639..7d4bf1df4 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -527,7 +527,6 @@ let mkdir = rec { cores = 1; dc = "tv"; #dc = "cac"; - infest.addr = head nets.internet.addrs4; nets = rec { internet = { addrs4 = ["104.233.84.215"]; @@ -614,7 +613,6 @@ let rmdir = rec { cores = 1; dc = "tv"; #dc = "cac"; - infest.addr = head nets.internet.addrs4; nets = rec { internet = { addrs4 = ["104.233.84.70"]; -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/51000000.lock: No such file or directory (2)