diff options
author | lassulus <lassulus@lassul.us> | 2017-09-19 22:56:19 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2017-09-19 22:56:19 +0200 |
commit | 821e59baca98b5caba65c6e7c7e4d6671593a69e (patch) | |
tree | 499e78ef143bf20c7cb2ef4137d031085d25c6a9 /tv | |
parent | d30480f1457cf4ac4f67f5e02faec75765706e50 (diff) | |
parent | 94c57badae775cb863b76a6c6cb8c11012cd4f83 (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv')
-rw-r--r-- | tv/1systems/cd/config.nix | 35 | ||||
-rw-r--r-- | tv/1systems/cd/source.nix | 3 |
2 files changed, 0 insertions, 38 deletions
diff --git a/tv/1systems/cd/config.nix b/tv/1systems/cd/config.nix deleted file mode 100644 index 341a62e45..000000000 --- a/tv/1systems/cd/config.nix +++ /dev/null @@ -1,35 +0,0 @@ -with import <stockholm/lib>; -{ config, pkgs, ... }: let - - bestGuessGateway = addr: elemAt (match "(.*)(\.[^.])" addr) 0 + ".1"; - -in { - krebs.build.host = config.krebs.hosts.cd; - - imports = [ - <stockholm/tv> - <stockholm/tv/2configs/hw/CAC-Developer-2.nix> - <stockholm/tv/2configs/fs/CAC-CentOS-7-64bit.nix> - <stockholm/tv/2configs/exim-smarthost.nix> - <stockholm/tv/2configs/retiolum.nix> - ]; - - networking = let - address = config.krebs.build.host.nets.internet.ip4.addr; - in { - defaultGateway = bestGuessGateway address; - interfaces.enp2s1.ip4 = singleton { - inherit address; - prefixLength = 24; - }; - nameservers = ["8.8.8.8"]; - }; - - environment.systemPackages = with pkgs; [ - iftop - iotop - iptables - nethogs - tcpdump - ]; -} diff --git a/tv/1systems/cd/source.nix b/tv/1systems/cd/source.nix deleted file mode 100644 index 019e8bc22..000000000 --- a/tv/1systems/cd/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import <stockholm/tv/source.nix> { - name = "cd"; -} |