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/omo.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index aa4a8a5c9..eed6d2316 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -37,7 +37,6 @@ in {
       ../.
       # TODO: unlock home partition via ssh
       ../2configs/fs/single-partition-ext4.nix
-      ../2configs/tinc-basic-retiolum.nix
       ../2configs/zsh-user.nix
       ../2configs/exim-retiolum.nix
       ../2configs/smart-monitor.nix
@@ -45,6 +44,7 @@ in {
       ../2configs/share-user-sftp.nix
       ../2configs/omo-share.nix
     ];
+  krebs.retiolum.enable = true;
   networking.firewall.trustedInterfaces = [ "enp3s0" ];
   # udp:137 udp:138 tcp:445 tcp:139 - samba, allowed in local net
   # tcp:80          - nginx for sharing files
-- 
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/omo.nix | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index eed6d2316..bfcd2298a 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -122,7 +122,6 @@ in {
   hardware.cpu.amd.updateMicrocode = true;
 
   zramSwap.enable = true;
-  zramSwap.numDevices = 2;
 
   krebs.build.host = config.krebs.hosts.omo;
 }
-- 
cgit v1.2.3