From 2b0c6616b66570d5648c5ebe3fdad6642510ede9 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 12 Apr 2016 17:13:29 +0200 Subject: doppelbock -> cd --- krebs/3modules/tv/default.nix | 37 +------------------------------------ tv/1systems/cd.nix | 18 +++++++++--------- tv/1systems/doppelbock.nix | 23 ----------------------- 3 files changed, 10 insertions(+), 68 deletions(-) delete mode 100644 tv/1systems/doppelbock.nix diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index b0f0ce54..a44aa552 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -21,7 +21,7 @@ with config.krebs.lib; }; nets = rec { internet = { - ip4.addr = "162.219.7.216"; + ip4.addr = "45.62.237.203"; aliases = [ "cd.i" "cd.internet" @@ -62,41 +62,6 @@ with config.krebs.lib; ssh.privkey.path = ; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOd/HqZIO9Trn3eycl23GZAz21HQCISaVNfNyaLSQvJ6"; }; - doppelbock = rec { - cores = 2; - nets = rec { - internet = { - ip4.addr = "45.62.237.203"; - aliases = [ - "doppelbock.i" - "doppelbock.internet" - ]; - }; - retiolum = { - via = internet; - ip4.addr = "10.243.113.224"; - ip6.addr = "42:4522:25f8:36bb:8ccb:0150:231a:2af5"; - aliases = [ - "doppelbock.r" - "doppelbock.retiolum" - "cgit.doppelbock.r" - "cgit.doppelbock.retiolum" - ]; - tinc.pubkey = '' - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAq/luvzH4CQX5qRuucUqR3aLwXtzsRmBOdd2hvrPG1z8ML2kKV+IG - 0aBfyJmQ8csfeGhOj0y0LEBv4bkEjEtYObs+LJfdWZC5e39eAVUE0z8QbSPOx4di - /7Bo+9sFRELP1kYb47eLR8quiIkslMWQMbTLM5RHoXJ5jE8fQSitfp4WUZYiSPDF - d5F7RU/ZQfTZuh8gv7RmSn/6N6bXAQWrueK6ZqMuImIjBrmYyXUWxgsDnpeHxR5j - j/0F2Bda5lyp+Qzv24PREdPT8FazUfmIQwZTTArXHxiqLq+SEVT21E4WEf2sJRan - dti9yVUW3eiqpu8b9BRpvxOB3YdkyqlrGwIDAQAB - -----END RSA PUBLIC KEY----- - ''; - }; - }; - ssh.privkey.path = ; - ssh.pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLhrVTEmbtuTsgRTHHxsLrq7ai1Yt7+oKFevr1gzktCQqHuyucXzxn60F00kuNDkNiKIF5fHmWy6ajU+6PKD3TfiFMagT9ah0x0RSB0+0tevxnlOp6VdHhrdM5YrBduWMiELmOiI1lvYhRqKd/ZE7b2mra6KYe5VtTi9UX3wQp8qN+bI01KCxv0p6ciUgEO8fnwLKDBUuFJ2UfE7Ais9XrXFIBFXB+MKcpLnIXvrV6dSXdUEiaswg8wo0Q0Y3tMaQ0dNJdH2yp3FVn1aiX3E/vVnffmDKMWYWqn78klujdEdmLm8/8NkXnc/jpgu8ZlSpQHECO2ZUJzd35yRnVKALv"; - }; mkdir = rec { cores = 1; nets = rec { diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 687f1795..32d956b8 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -61,16 +61,16 @@ with config.krebs.lib; } ]; - networking.interfaces.enp2s1.ip4 = [ - { - address = "162.219.7.216"; + networking = { + interfaces.enp2s1.ip4 = singleton { + address = let + addr = "45.62.237.203"; + in assert config.krebs.build.host.nets.internet.ip4.addr == addr; addr; prefixLength = 24; - } - ]; - networking.defaultGateway = "162.219.7.1"; - networking.nameservers = [ - "8.8.8.8" - ]; + }; + defaultGateway = "45.62.237.1"; + nameservers = ["8.8.8.8"]; + }; environment.systemPackages = with pkgs; [ htop diff --git a/tv/1systems/doppelbock.nix b/tv/1systems/doppelbock.nix deleted file mode 100644 index ec85a777..00000000 --- a/tv/1systems/doppelbock.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, lib, pkgs, ... }: -with config.krebs.lib; -{ - krebs.build.host = config.krebs.hosts.doppelbock; - - imports = [ - ../. - ../2configs/hw/CAC-Developer-2.nix - ../2configs/fs/CAC-CentOS-7-64bit.nix - ../2configs/retiolum.nix - ]; - - networking = { - interfaces.enp2s1.ip4 = singleton { - address = let - addr = "45.62.237.203"; - in assert config.krebs.build.host.nets.internet.ip4.addr == addr; addr; - prefixLength = 24; - }; - defaultGateway = "45.62.237.1"; - nameservers = ["8.8.8.8"]; - }; -} -- cgit v1.2.3