diff options
| author | lassulus <lass@aidsballs.de> | 2016-03-15 14:14:29 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-03-15 14:14:29 +0100 |
| commit | 72939a2d6f45950dbfa6ec0815eae62e83d02630 (patch) | |
| tree | d35ae568feeb1d1110be316ba8d434308e0aa780 /makefu/1systems/wry.nix | |
| parent | db3dd77f6de5964bcaa265bf8e5863d7647932f5 (diff) | |
| parent | 2e317bfe747ec968d3b933ae4c0df68ad204021c (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/wry.nix')
| -rw-r--r-- | makefu/1systems/wry.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix index 462ec4faf..edaf1b803 100644 --- a/makefu/1systems/wry.nix +++ b/makefu/1systems/wry.nix @@ -12,7 +12,6 @@ in { ../../tv/2configs/hw/CAC.nix ../../tv/2configs/fs/CAC-CentOS-7-64bit.nix ../2configs/headless.nix - ../2configs/tinc-basic-retiolum.nix ../2configs/bepasty-dual.nix @@ -27,6 +26,7 @@ in { # collectd ../2configs/collectd/collectd-base.nix ]; + krebs.retiolum.enable = true; services.nixosManual.enable = false; programs.man.enable = false; krebs.build.host = config.krebs.hosts.wry; @@ -52,7 +52,6 @@ in { krebs.nginx.enable = true; krebs.retiolum-bootstrap.enable = true; - nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; krebs.tinc_graphs = { enable = true; nginx = { |