From fe4f5b98b91f6bacb036d57b5322fb4e09c22f14 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 27 Oct 2015 18:12:05 +0100
Subject: m 12 collectd: wry uses cherry-picked collectd to enable python
 support

---
 makefu/1systems/wry.nix | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 6627d87b5..fc98179e4 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -19,6 +19,9 @@ in {
 
       # Reaktor
       ../2configs/Reaktor/simpleExtend.nix
+
+      # collectd
+      ../2configs/collectd/collectd-base.nix
   ];
 
   krebs.build = {
-- 
cgit v1.2.3


From bd09f983913ed6e0181d2a9bc4e92e1e8fa4c4fe Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 28 Oct 2015 15:05:15 +0100
Subject: m 2 headless: init

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

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

diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 3baf31dc5..1c6f35503 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -11,6 +11,7 @@ in {
       ../../tv/2configs/CAC-CentOS-7-64bit.nix
       ../2configs/base.nix
       ../2configs/unstable-sources.nix
+      ../2configs/headless.nix
       ../2configs/tinc-basic-retiolum.nix
 
       ../2configs/bepasty-dual.nix
@@ -67,6 +68,4 @@ in {
   };
 
 
-  # based on ../../tv/2configs/CAC-Developer-2.nix
-  sound.enable = false;
 }
-- 
cgit v1.2.3


From 84ebd8c02132131d893fd9bb92ea523e59272649 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 28 Oct 2015 21:31:07 +0100
Subject: m 1 wry: serve euer wiki

---
 makefu/1systems/wry.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 1c6f35503..24ec16c64 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -20,6 +20,9 @@ in {
 
       # Reaktor
       ../2configs/Reaktor/simpleExtend.nix
+
+      # other nginx
+      ../2configs/nginx/euer.wiki.nix
   ];
 
   krebs.build = {
@@ -28,8 +31,6 @@ in {
     host = config.krebs.hosts.wry;
   };
 
-
-
   krebs.Reaktor.enable = true;
 
   # bepasty to listen only on the correct interfaces
@@ -59,6 +60,7 @@ in {
   networking = {
     firewall.allowPing = true;
     firewall.allowedTCPPorts = [ 53 80 443 ];
+    firewall.allowedUDPPorts = [ 655 ];
     interfaces.enp2s1.ip4 = [{
       address = external-ip;
       prefixLength = 24;
-- 
cgit v1.2.3