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 ++++++++++++++--------
 makefu/1systems/wry.nix                   |  4 ++--
 makefu/2configs/fs/CAC-CentOS-7-64bit.nix | 20 ++++++++++++++++++++
 makefu/2configs/hw/CAC.nix                | 13 +++++++++++++
 4 files changed, 49 insertions(+), 10 deletions(-)
 create mode 100644 makefu/2configs/fs/CAC-CentOS-7-64bit.nix
 create mode 100644 makefu/2configs/hw/CAC.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 ];
 }
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index d9f8ded83..ed48c6abe 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -9,8 +9,8 @@ in {
   imports = [
       ../.
       # TODO: copy this config or move to krebs
-      ../../tv/2configs/hw/CAC.nix
-      ../../tv/2configs/fs/CAC-CentOS-7-64bit.nix
+      ../2configs/hw/CAC.nix
+      ../2configs/fs/CAC-CentOS-7-64bit.nix
       ../2configs/headless.nix
 
       ../2configs/bepasty-dual.nix
diff --git a/makefu/2configs/fs/CAC-CentOS-7-64bit.nix b/makefu/2configs/fs/CAC-CentOS-7-64bit.nix
new file mode 100644
index 000000000..c9eb97f44
--- /dev/null
+++ b/makefu/2configs/fs/CAC-CentOS-7-64bit.nix
@@ -0,0 +1,20 @@
+_:
+
+{
+  boot.loader.grub = {
+    device = "/dev/sda";
+  };
+  fileSystems = {
+    "/" = {
+      device = "/dev/centos/root";
+      fsType = "xfs";
+    };
+    "/boot" = {
+      device = "/dev/sda1";
+      fsType = "xfs";
+    };
+  };
+  swapDevices = [
+    { device = "/dev/centos/swap"; }
+  ];
+}
diff --git a/makefu/2configs/hw/CAC.nix b/makefu/2configs/hw/CAC.nix
new file mode 100644
index 000000000..9ed18344a
--- /dev/null
+++ b/makefu/2configs/hw/CAC.nix
@@ -0,0 +1,13 @@
+_:
+{
+  boot.initrd.availableKernelModules = [
+    "ata_piix"
+    "vmw_pvscsi"
+  ];
+  boot.loader.grub.splashImage = null;
+  nix = {
+    daemonIONiceLevel = 1;
+    daemonNiceLevel = 1;
+  };
+  sound.enable = false;
+}
-- 
cgit v1.2.3