summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-04-13 16:52:36 +0200
committerlassulus <lass@aidsballs.de>2016-04-13 16:52:36 +0200
commitedbf4050efd24941e6b00a4524f3b7e878dfd24f (patch)
treea920b5560c330ace7183ddda32cfb3b08f9d6351 /tv
parent2e8743934061ecb8019c34ee4b1010238e158bf1 (diff)
parent2b0c6616b66570d5648c5ebe3fdad6642510ede9 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/cd.nix18
-rw-r--r--tv/1systems/doppelbock.nix23
2 files changed, 9 insertions, 32 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 687f17951..32d956b8a 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 ec85a7772..000000000
--- 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"];
- };
-}