From 516603010dfba3d8e3e1d4f7df210ddb99556dfd Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 19 Sep 2017 22:27:16 +0200
Subject: tv cd: final commit

---
 tv/1systems/cd/config.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'tv/1systems')

diff --git a/tv/1systems/cd/config.nix b/tv/1systems/cd/config.nix
index 341a62e45..e7e2cdc29 100644
--- a/tv/1systems/cd/config.nix
+++ b/tv/1systems/cd/config.nix
@@ -10,7 +10,8 @@ in {
     <stockholm/tv>
     <stockholm/tv/2configs/hw/CAC-Developer-2.nix>
     <stockholm/tv/2configs/fs/CAC-CentOS-7-64bit.nix>
-    <stockholm/tv/2configs/exim-smarthost.nix>
+    # TODO see XXX below
+    #<stockholm/tv/2configs/exim-smarthost.nix>
     <stockholm/tv/2configs/retiolum.nix>
   ];
 
@@ -33,3 +34,17 @@ in {
     tcpdump
   ];
 }
+
+# XXX this should be unnecessary, but when security.wrappers isn't defined,
+# then install fails with:
+#
+# mktemp: failed to create directory via template '/run/wrappers/wrappers.XXXXXXXXXX': No such file or directory
+# chmod: missing operand after 'a+rx'
+# Try 'chmod --help' for more information.
+# ln: failed to create symbolic link './bin': File exists
+# cp: cannot create regular file '/run/wrappers/bin/exim': No such file or directory
+# chown: cannot access '/run/wrappers/bin/exim': No such file or directory
+# chmod: cannot access '/run/wrappers/bin/exim': No such file or directory
+# cp: cannot create regular file '/run/wrappers/bin/sendmail': No such file or directory
+# chown: cannot access '/run/wrappers/bin/sendmail': No such file or directory
+# chmod: cannot access '/run/wrappers/bin/sendmail': No such file or directory
-- 
cgit v1.2.3


From 94c57badae775cb863b76a6c6cb8c11012cd4f83 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 19 Sep 2017 22:28:36 +0200
Subject: tv cd: RIP, thanks for alots of no fish

---
 tv/1systems/cd/config.nix | 50 -----------------------------------------------
 tv/1systems/cd/source.nix |  3 ---
 2 files changed, 53 deletions(-)
 delete mode 100644 tv/1systems/cd/config.nix
 delete mode 100644 tv/1systems/cd/source.nix

(limited to 'tv/1systems')

diff --git a/tv/1systems/cd/config.nix b/tv/1systems/cd/config.nix
deleted file mode 100644
index e7e2cdc29..000000000
--- a/tv/1systems/cd/config.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-with import <stockholm/lib>;
-{ config, pkgs, ... }: let
-
-  bestGuessGateway = addr: elemAt (match "(.*)(\.[^.])" addr) 0 + ".1";
-
-in {
-  krebs.build.host = config.krebs.hosts.cd;
-
-  imports = [
-    <stockholm/tv>
-    <stockholm/tv/2configs/hw/CAC-Developer-2.nix>
-    <stockholm/tv/2configs/fs/CAC-CentOS-7-64bit.nix>
-    # TODO see XXX below
-    #<stockholm/tv/2configs/exim-smarthost.nix>
-    <stockholm/tv/2configs/retiolum.nix>
-  ];
-
-  networking = let
-    address = config.krebs.build.host.nets.internet.ip4.addr;
-  in {
-    defaultGateway = bestGuessGateway address;
-    interfaces.enp2s1.ip4 = singleton {
-      inherit address;
-      prefixLength = 24;
-    };
-    nameservers = ["8.8.8.8"];
-  };
-
-  environment.systemPackages = with pkgs; [
-    iftop
-    iotop
-    iptables
-    nethogs
-    tcpdump
-  ];
-}
-
-# XXX this should be unnecessary, but when security.wrappers isn't defined,
-# then install fails with:
-#
-# mktemp: failed to create directory via template '/run/wrappers/wrappers.XXXXXXXXXX': No such file or directory
-# chmod: missing operand after 'a+rx'
-# Try 'chmod --help' for more information.
-# ln: failed to create symbolic link './bin': File exists
-# cp: cannot create regular file '/run/wrappers/bin/exim': No such file or directory
-# chown: cannot access '/run/wrappers/bin/exim': No such file or directory
-# chmod: cannot access '/run/wrappers/bin/exim': No such file or directory
-# cp: cannot create regular file '/run/wrappers/bin/sendmail': No such file or directory
-# chown: cannot access '/run/wrappers/bin/sendmail': No such file or directory
-# chmod: cannot access '/run/wrappers/bin/sendmail': No such file or directory
diff --git a/tv/1systems/cd/source.nix b/tv/1systems/cd/source.nix
deleted file mode 100644
index 019e8bc22..000000000
--- a/tv/1systems/cd/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-import <stockholm/tv/source.nix> {
-  name = "cd";
-}
-- 
cgit v1.2.3