From 14d1655deb456d6be95463af2ca1524f7a1b7a98 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 22 Dec 2015 16:30:01 +0100 Subject: s 1 test-centos7: prepare for ci --- shared/1systems/test-centos7.nix | 3 ++- shared/2configs/base.nix | 4 ++-- shared/2configs/temp/dirs.nix | 1 + shared/2configs/temp/networking.nix | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 shared/2configs/temp/dirs.nix create mode 100644 shared/2configs/temp/networking.nix (limited to 'shared') diff --git a/shared/1systems/test-centos7.nix b/shared/1systems/test-centos7.nix index 077a5d61b..48cecc877 100644 --- a/shared/1systems/test-centos7.nix +++ b/shared/1systems/test-centos7.nix @@ -7,7 +7,8 @@ in { imports = [ ../2configs/base.nix ../2configs/os-templates/CAC-CentOS-7-64bit.nix - ../2configs/os-templates/temp-networking.nix + ../2configs/temp/networking.nix + ../2configs/temp/dirs.nix ]; sound.enable = false; diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix index df41eae1a..fceea67d1 100644 --- a/shared/2configs/base.nix +++ b/shared/2configs/base.nix @@ -20,11 +20,11 @@ with lib; }; dir.secrets = { host = config.krebs.current.host; - path = "${getEnv "HOME"}/secrets/krebs/wolf"; + path = mkDefault "${getEnv "HOME"}/secrets/krebs/wolf"; }; dir.stockholm = { host = config.krebs.current.host; - path = "${getEnv "HOME"}/stockholm"; + path = mkDefault "${getEnv "HOME"}/stockholm"; }; }; diff --git a/shared/2configs/temp/dirs.nix b/shared/2configs/temp/dirs.nix new file mode 100644 index 000000000..958608a54 --- /dev/null +++ b/shared/2configs/temp/dirs.nix @@ -0,0 +1 @@ +_: { } diff --git a/shared/2configs/temp/networking.nix b/shared/2configs/temp/networking.nix new file mode 100644 index 000000000..958608a54 --- /dev/null +++ b/shared/2configs/temp/networking.nix @@ -0,0 +1 @@ +_: { } -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/ad100000.lock: No such file or directory (2)