diff options
| author | makefu <github@syntax-fehler.de> | 2015-12-22 16:30:01 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-12-22 16:30:01 +0100 |
| commit | 14d1655deb456d6be95463af2ca1524f7a1b7a98 (patch) | |
| tree | b76e1c11859ee3255f50fc3b97121a4173378ff6 | |
| parent | 5821d8438578db623a3e248c52fefa424fad0b51 (diff) | |
s 1 test-centos7: prepare for ci
| -rw-r--r-- | shared/1systems/test-centos7.nix | 3 | ||||
| -rw-r--r-- | shared/2configs/base.nix | 4 | ||||
| -rw-r--r-- | shared/2configs/temp/dirs.nix | 1 | ||||
| -rw-r--r-- | shared/2configs/temp/networking.nix | 1 |
4 files changed, 6 insertions, 3 deletions
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 @@ +_: { } |