diff options
| author | makefu <github@syntax-fehler.de> | 2015-09-04 23:06:43 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-09-04 23:06:43 +0200 |
| commit | d6d9956abc60548c755d30e6a5bd13c10abbb181 (patch) | |
| tree | 072755a64ed4dc433d8dc6053c6e9d16ecfa870c /makefu/1systems | |
| parent | 6099a42734f4fe242c7d244944cb2b3b23b2524f (diff) | |
makefu/pnp: uses new Reaktor infrastructure
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/pnp.nix | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 6ca1f1108..98f3ecd22 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -7,21 +7,33 @@ { imports = [ # Include the results of the hardware scan. - <nixpkgs/nixos/modules/profiles/qemu-guest.nix> + # Base ../2configs/base.nix - ../2configs/git/cgit-retiolum.nix - # ../2configs/graphite-standalone.nix - ../2configs/fs/vm-single-partition.nix ../2configs/tinc-basic-retiolum.nix + # HW/FS + <nixpkgs/nixos/modules/profiles/qemu-guest.nix> + ../2configs/fs/vm-single-partition.nix + + # Services + ../2configs/git/cgit-retiolum.nix + + ## Reaktor + ## \/ are only plugins, must enable Reaktor explicitly + ../2configs/Reaktor/stockholmLentil.nix + ../2configs/Reaktor/simpleExtend.nix + ../2configs/exim-retiolum.nix ../2configs/urlwatch.nix + + # ../2configs/graphite-standalone.nix ]; + krebs.Reaktor.enable = true; + krebs.build.host = config.krebs.hosts.pnp; krebs.build.user = config.krebs.users.makefu; krebs.build.target = "root@pnp"; - krebs.Reaktor.enable = true; krebs.build.deps = { nixpkgs = { |