diff options
| author | lassulus <lass@aidsballs.de> | 2015-12-20 19:00:20 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-12-20 19:00:20 +0100 |
| commit | 85f3aa5b86ab9fd4afb7e5adafc0e329ab618102 (patch) | |
| tree | b5a8f94d5af87eb24c0df3a85577ab9fe4542419 /shared | |
| parent | 07f4510ad0bff0f9d72e5dcee279a30a0d5f8da3 (diff) | |
| parent | 5821d8438578db623a3e248c52fefa424fad0b51 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/1systems/test-centos7.nix | 20 | ||||
| -rw-r--r-- | shared/1systems/wolf.nix | 1 |
2 files changed, 3 insertions, 18 deletions
diff --git a/shared/1systems/test-centos7.nix b/shared/1systems/test-centos7.nix index 51e99600c..077a5d61b 100644 --- a/shared/1systems/test-centos7.nix +++ b/shared/1systems/test-centos7.nix @@ -3,29 +3,13 @@ let inherit (lib) head; - ip = "168.235.145.85"; - gw = "168.235.145.1"; in { imports = [ ../2configs/base.nix ../2configs/os-templates/CAC-CentOS-7-64bit.nix - { - networking.interfaces.enp2s1.ip4 = [ - { - address = ip; - prefixLength = 24; - } - ]; - networking.defaultGateway = gw; - networking.nameservers = [ - "8.8.8.8" - ]; - - } - { - sound.enable = false; - } + ../2configs/os-templates/temp-networking.nix ]; + sound.enable = false; krebs.build.host = config.krebs.hosts.test-centos7; } diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index a3e527a3b..2c51ac8fe 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -12,6 +12,7 @@ in ../2configs/shack-nix-cacher.nix ../2configs/shack-drivedroid.nix ../2configs/cac-ci.nix + ../2configs/graphite.nix ]; # use your own binary cache, fallback use cache.nixos.org (which is used by # apt-cacher-ng in first place) |