diff options
| author | makefu <github@syntax-fehler.de> | 2017-07-15 19:01:02 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-07-15 22:29:14 +0200 |
| commit | 7704f80890c75f65c2906ecc17cdd89761d308ad (patch) | |
| tree | febe3c92e7eb672767f7162f175b2d94fe51c2e7 /makefu/1systems/wry | |
| parent | fa38155eec9563dc9dc620a77900d87b97443cfe (diff) | |
ma: replace path to 2configs, init source.nix
Diffstat (limited to 'makefu/1systems/wry')
| -rw-r--r-- | makefu/1systems/wry/config.nix | 24 | ||||
| -rw-r--r-- | makefu/1systems/wry/source.nix | 3 |
2 files changed, 15 insertions, 12 deletions
diff --git a/makefu/1systems/wry/config.nix b/makefu/1systems/wry/config.nix index f5097bf4..2db1a9a9 100644 --- a/makefu/1systems/wry/config.nix +++ b/makefu/1systems/wry/config.nix @@ -7,26 +7,26 @@ let internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr; in { imports = [ - ../. + <stockholm/makefu> # TODO: copy this config or move to krebs - ../2configs/hw/CAC.nix - ../2configs/fs/CAC-CentOS-7-64bit.nix - ../2configs/save-diskspace.nix + <stockholm/makefu/2configs/hw/CAC.nix> + <stockholm/makefu/2configs/fs/CAC-CentOS-7-64bit.nix> + <stockholm/makefu/2configs/save-diskspace.nix> - # ../2configs/bepasty-dual.nix + # <stockholm/makefu/2configs/bepasty-dual.nix> - ../2configs/iodined.nix - ../2configs/backup.nix + <stockholm/makefu/2configs/iodined.nix> + <stockholm/makefu/2configs/backup.nix> # other nginx - # ../2configs/nginx/euer.test.nix + # <stockholm/makefu/2configs/nginx/euer.test.nix> # collectd - ../2configs/stats/client.nix - ../2configs/logging/client.nix + <stockholm/makefu/2configs/stats/client.nix> + <stockholm/makefu/2configs/logging/client.nix> - ../2configs/tinc/retiolum.nix - # ../2configs/torrent.nix + <stockholm/makefu/2configs/tinc/retiolum.nix> + # <stockholm/makefu/2configs/torrent.nix> ]; krebs.build.host = config.krebs.hosts.wry; diff --git a/makefu/1systems/wry/source.nix b/makefu/1systems/wry/source.nix new file mode 100644 index 00000000..fac3877e --- /dev/null +++ b/makefu/1systems/wry/source.nix @@ -0,0 +1,3 @@ +import <stockholm/makefu/source.nix> { + name="wry"; +} |