diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index ccc3a44b9..9e4146ff2 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -108,7 +108,6 @@ let { krebs.dns.providers = { "krebsco.de" = "zones"; - gg23 = "hosts"; shack = "hosts"; i = "hosts"; r = "hosts"; diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index a20801b12..c2bf406f1 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -131,11 +131,6 @@ in { ci = true; cores = 2; nets = { - gg23 = { - ip4.addr = "10.23.1.110"; - aliases = ["nomic.gg23"]; - ssh.port = 11423; - }; retiolum = { ip4.addr = "10.243.0.110"; aliases = [ @@ -158,27 +153,10 @@ in { ssh.privkey.path = ; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMIHmwXHV7E9UGuk4voVCADjlLkyygqNw054jvrsPn5t root@nomic"; }; - ok = { - external = true; - nets = { - gg23 = { - ip4.addr = "10.23.1.1"; - aliases = ["ok.gg23"]; - }; - }; - }; wu = { ci = true; cores = 4; nets = { - gg23 = { - ip4.addr = "10.23.1.37"; - aliases = [ - "wu.gg23" - "cache.wu.gg23" - ]; - ssh.port = 11423; - }; retiolum = { ip4.addr = "10.243.13.37"; aliases = [ @@ -237,14 +215,6 @@ in { ci = true; cores = 4; nets = { - gg23 = { - ip4.addr = "10.23.1.38"; - aliases = [ - "xu.gg23" - "cache.xu.gg23" - ]; - ssh.port = 11423; - }; retiolum = { ip4.addr = "10.243.13.38"; aliases = [ @@ -272,13 +242,6 @@ in { ci = true; cores = 4; nets = { - gg23 = { - ip4.addr = "10.23.1.39"; - aliases = [ - "zu.gg23" - ]; - ssh.port = 11423; - }; retiolum = { ip4.addr = "10.243.13.40"; aliases = [ diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 4d27b0eac..01f83482e 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -16,6 +16,7 @@ with import ; ./backup.nix ./bash ./htop.nix + ./nets/gg23.nix ./nginx ./pki ./ssh.nix diff --git a/tv/2configs/nets/gg23.nix b/tv/2configs/nets/gg23.nix new file mode 100644 index 000000000..fc5d239d5 --- /dev/null +++ b/tv/2configs/nets/gg23.nix @@ -0,0 +1,69 @@ +{ + krebs = { + dns.providers.gg23 = "hosts"; + hosts = { + nomic = { + nets.gg23 = { + ip4 = { + addr = "10.23.1.110"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "nomic.gg23" + ]; + ssh.port = 11423; + }; + }; + ok = { + external = true; + nets.gg23 = { + ip4 = { + addr = "10.23.1.1"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "ok.gg23" + ]; + }; + }; + wu = { + nets.gg23 = { + ip4 = { + addr = "10.23.1.37"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "wu.gg23" + "cache.wu.gg23" + ]; + ssh.port = 11423; + }; + }; + xu = { + nets.gg23 = { + ip4 = { + addr = "10.23.1.38"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "xu.gg23" + "cache.xu.gg23" + ]; + ssh.port = 11423; + }; + }; + zu = { + nets.gg23 = { + ip4 = { + addr = "10.23.1.39"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "zu.gg23" + ]; + ssh.port = 11423; + }; + }; + }; + }; +}