diff options
| author | tv <tv@krebsco.de> | 2016-02-15 16:27:11 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-02-15 16:34:50 +0100 |
| commit | 8f520b19b623919fa6319029a955d43fd051773c (patch) | |
| tree | 2181809786e54d053532fab2f24b1ff032592e41 /shared/1systems | |
| parent | 673853e092c211e26a08030f87f9c868c6442a71 (diff) | |
don't try to mimic nixpkgs
Diffstat (limited to 'shared/1systems')
| -rw-r--r-- | shared/1systems/test-all-krebs-modules.nix | 3 | ||||
| -rw-r--r-- | shared/1systems/test-arch.nix | 1 | ||||
| -rw-r--r-- | shared/1systems/test-centos6.nix | 1 | ||||
| -rw-r--r-- | shared/1systems/test-centos7.nix | 1 | ||||
| -rw-r--r-- | shared/1systems/test-failing.nix | 3 | ||||
| -rw-r--r-- | shared/1systems/test-minimal-deploy.nix | 3 | ||||
| -rw-r--r-- | shared/1systems/wolf.nix | 1 |
7 files changed, 13 insertions, 0 deletions
diff --git a/shared/1systems/test-all-krebs-modules.nix b/shared/1systems/test-all-krebs-modules.nix index b98004df..e1021c7e 100644 --- a/shared/1systems/test-all-krebs-modules.nix +++ b/shared/1systems/test-all-krebs-modules.nix @@ -2,6 +2,9 @@ let en = { enable = true;}; in { + imports = [ + ../. + ]; krebs = { enable = true; build.user = config.krebs.users.shared; diff --git a/shared/1systems/test-arch.nix b/shared/1systems/test-arch.nix index ece20949..14fc0384 100644 --- a/shared/1systems/test-arch.nix +++ b/shared/1systems/test-arch.nix @@ -2,6 +2,7 @@ { imports = [ + ../. ../2configs/base.nix { boot.loader.grub = { diff --git a/shared/1systems/test-centos6.nix b/shared/1systems/test-centos6.nix index a8b5f9b9..8add0b7c 100644 --- a/shared/1systems/test-centos6.nix +++ b/shared/1systems/test-centos6.nix @@ -7,6 +7,7 @@ let gw = "168.235.148.1"; in { imports = [ + ../. ../2configs/base.nix ../2configs/os-templates/CAC-CentOS-6.5-64bit.nix { diff --git a/shared/1systems/test-centos7.nix b/shared/1systems/test-centos7.nix index 48cecc87..65daff50 100644 --- a/shared/1systems/test-centos7.nix +++ b/shared/1systems/test-centos7.nix @@ -5,6 +5,7 @@ let in { imports = [ + ../. ../2configs/base.nix ../2configs/os-templates/CAC-CentOS-7-64bit.nix ../2configs/temp/networking.nix diff --git a/shared/1systems/test-failing.nix b/shared/1systems/test-failing.nix index 81a9e48d..fe1c2cb6 100644 --- a/shared/1systems/test-failing.nix +++ b/shared/1systems/test-failing.nix @@ -1,6 +1,9 @@ { config, pkgs, ... }: { + imports = [ + ../. + ]; programs.ssh.startAgent = true; programs.ssh.startAgent = false; } diff --git a/shared/1systems/test-minimal-deploy.nix b/shared/1systems/test-minimal-deploy.nix index 309e2895..bec2b38d 100644 --- a/shared/1systems/test-minimal-deploy.nix +++ b/shared/1systems/test-minimal-deploy.nix @@ -1,5 +1,8 @@ { config, pkgs, lib, ... }: { + imports = [ + ../. + ]; krebs = { enable = true; build.user = config.krebs.users.shared; diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index 9a514428..31759143 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -6,6 +6,7 @@ let in { imports = [ + ../. ../2configs/base.nix <nixpkgs/nixos/modules/profiles/qemu-guest.nix> ../2configs/collectd-base.nix |