From 144fcda288eb050153620c386511c7722e031029 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 28 Aug 2015 22:27:23 +0200
Subject: {tv,krebs}: import krebs pkgs with lib

---
 tv/1systems/cd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/1systems/cd.nix')

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 9f412d9b8..8d6ac957a 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  tvpkgs = import ../5pkgs { inherit pkgs; };
+  tvpkgs = import ../5pkgs { inherit lib pkgs; };
 in
 
 {
-- 
cgit v1.2.3


From 09257f97823e9a57cda749c2d5a69b18ef484cec Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 29 Aug 2015 00:19:52 +0200
Subject: tv: use only pkgs

---
 tv/1systems/cd.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'tv/1systems/cd.nix')

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 8d6ac957a..0049387be 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -2,10 +2,6 @@
 
 with lib;
 
-let
-  tvpkgs = import ../5pkgs { inherit lib pkgs; };
-in
-
 {
   krebs.build.host = config.krebs.hosts.cd;
   krebs.build.user = config.krebs.users.tv;
@@ -136,7 +132,7 @@ in
         server-names = singleton "viljetic.de";
         # TODO directly set root (instead via location)
         locations = singleton (nameValuePair "/" ''
-          root ${tvpkgs.viljetic-pages};
+          root ${pkgs.viljetic-pages};
         '');
       };
     }
-- 
cgit v1.2.3


From 5591b1dd120dac7cc52098eaacb1476da7b9cb84 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 29 Aug 2015 00:58:41 +0200
Subject: Z* -> */Z*

---
 tv/1systems/cd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/1systems/cd.nix')

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 0049387be..03c375b9b 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -31,7 +31,7 @@ with lib;
       imports = [ ../2configs/charybdis.nix ];
       tv.charybdis = {
         enable = true;
-        sslCert = ../../Zcerts/charybdis_cd.crt.pem;
+        sslCert = ../Zcerts/charybdis_cd.crt.pem;
       };
     }
     {
-- 
cgit v1.2.3


From bf2ef5c76ba3ee84a067b26da40334a4dd192be4 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 29 Aug 2015 08:57:53 +0200
Subject: tv {cd,nomic} += ntp

---
 tv/1systems/cd.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv/1systems/cd.nix')

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 03c375b9b..bb8124576 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -167,6 +167,7 @@ with lib;
     iptables
     mutt    # for mv
     nethogs
+    ntp     # ntpate
     rxvt_unicode.terminfo
     tcpdump
   ];
-- 
cgit v1.2.3


From 83f06535de527c7470f8ff9c8b5e3a4632cf7cb9 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 29 Aug 2015 09:02:00 +0200
Subject: tv {cd,nomic,wu}: disable consul

---
 tv/1systems/cd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/1systems/cd.nix')

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index bb8124576..b385848f1 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -25,7 +25,7 @@ with lib;
     ../2configs/CAC-Developer-2.nix
     ../2configs/CAC-CentOS-7-64bit.nix
     ../2configs/base.nix
-    ../2configs/consul-server.nix
+    #../2configs/consul-server.nix
     ../2configs/git.nix
     {
       imports = [ ../2configs/charybdis.nix ];
-- 
cgit v1.2.3