From f5e1235d01e989437bb1352c403a5c9d4afcb3d3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 11 Mar 2016 02:10:34 +0100
Subject: ma 2 tinc-basic-retiolum: RIP

---
 makefu/1systems/wry.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/1systems/wry.nix')

diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 462ec4faf..c49b48ea1 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;
-- 
cgit v1.2.3


From 2e317bfe747ec968d3b933ae4c0df68ad204021c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 15 Mar 2016 13:20:14 +0100
Subject: ma 2: use tinc-pre per default

---
 makefu/1systems/wry.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'makefu/1systems/wry.nix')

diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index c49b48ea1..edaf1b803 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -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 = {
-- 
cgit v1.2.3