diff options
| author | tv <tv@krebsco.de> | 2016-11-18 14:44:18 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-11-18 14:44:18 +0100 |
| commit | 151ca19a6e67e0c7644f489069cfbc17cec71187 (patch) | |
| tree | f84467f88558afb721ca716cc582e6d0b9abadf3 /makefu/1systems | |
| parent | 0f523dfd8a560aa5f5e36c90d47e2322f3dd7882 (diff) | |
| parent | 0155fc32e1b79bc25fdfc81ee8460438b70ba128 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/vbob.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index 56d1b01ba..7421125e4 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -8,12 +8,12 @@ (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>) (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>) ../2configs/main-laptop.nix #< base-gui - # <secrets/extra-hosts.nix> # environment ../2configs/tinc/retiolum.nix ]; + networking.extraHosts = import (toString <secrets/extra-hosts.nix>); # workaround for https://github.com/NixOS/nixpkgs/issues/16641 services.xserver.videoDrivers = lib.mkOverride 45 [ "virtualbox" "modesetting" ]; @@ -41,8 +41,10 @@ get logstash # docker - devpi-web - devpi-client + #devpi-web + #devpi-client + debmirror + ansible ]; # virtualisation.docker.enable = true; |