From f256bbcb11565138e92266e97856438061b623a0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 13 Jun 2016 16:22:51 +0200
Subject: cp tv/2/*CAC -> makefu/2/

---
 makefu/1systems/shoney.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

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

diff --git a/makefu/1systems/shoney.nix b/makefu/1systems/shoney.nix
index ebe5222c3..16e891995 100644
--- a/makefu/1systems/shoney.nix
+++ b/makefu/1systems/shoney.nix
@@ -1,15 +1,19 @@
 { config, pkgs, ... }:
 let
-  ip = "64.137.235.70";
-  gw = "64.137.235.1";
+  ip     = "64.137.234.215";
+  alt-ip = "64.137.234.210";
+  extra-ip = "64.137.234.114"; #currently unused
+  gw = "64.137.234.1";
 in {
   imports = [
     ../.
-    ../../tv/2configs/hw/CAC.nix
-    ../../tv/2configs/fs/CAC-CentOS-7-64bit.nix
+    ../2configs/hw/CAC.nix
+    ../2configs/fs/CAC-CentOS-7-64bit.nix
 
   ];
 
+
+
   # minimal resources
   services.nixosManual.enable = false;
   programs.man.enable = false;
@@ -21,10 +25,12 @@ in {
     retiolum.enable = true;
     build.host = config.krebs.hosts.shoney;
   };
-  networking.interfaces.enp2s1.ip4 = [ {
-    address = ip;
-    prefixLength = 24;
-  } ];
+  networking.interfaces.enp2s1.ip4 = [
+    { address = ip; prefixLength = 24; }
+    { address = alt-ip; prefixLength = 24; }
+  ];
   networking.defaultGateway = gw;
   networking.nameservers = [ "8.8.8.8" ];
+  networking.firewall.allowedUDPPorts = [ 655 1655 ];
+  networking.firewall.allowedTCPPorts = [ 655 1655 ];
 }
-- 
cgit v1.2.3


From 6ac8034a47f840206d999be8ec39fedbc6b7b350 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 14 Jun 2016 01:33:41 +0200
Subject: ma 1 shoney: init siem tinc

---
 makefu/1systems/shoney.nix | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/makefu/1systems/shoney.nix b/makefu/1systems/shoney.nix
index 16e891995..48679fe58 100644
--- a/makefu/1systems/shoney.nix
+++ b/makefu/1systems/shoney.nix
@@ -13,6 +13,7 @@ in {
   ];
 
 
+  services.tinc.networks.siem.name = "sjump";
 
   # minimal resources
   services.nixosManual.enable = false;
@@ -29,6 +30,7 @@ in {
     { address = ip; prefixLength = 24; }
     { address = alt-ip; prefixLength = 24; }
   ];
+
   networking.defaultGateway = gw;
   networking.nameservers = [ "8.8.8.8" ];
   networking.firewall.allowedUDPPorts = [ 655 1655 ];
-- 
cgit v1.2.3