From 06906064662b4e8163bef70b5b02f1001bedba17 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 14 Jan 2016 15:53:33 +0100
Subject: nomic: use pulse and xserver

---
 tv/1systems/nomic.nix | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 0c6c935a..7bc7b70d 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -11,6 +11,8 @@ with lib;
     ../2configs/hw/AO753.nix
     #../2configs/consul-server.nix
     ../2configs/git.nix
+    ../2configs/pulse.nix
+    ../2configs/xserver
     {
       tv.iptables = {
         enable = true;
-- 
cgit v1.2.3


From f6a4131daecd6e5c1a0727adbcac43ba8530ec13 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 1 Feb 2016 17:13:46 +0100
Subject: tv exim-retiolum: init

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

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

diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 7bc7b70d..145e9b23 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -5,11 +5,9 @@ with lib;
 {
   krebs.build.host = config.krebs.hosts.nomic;
 
-  krebs.build.target = "root@nomic.gg23";
-
   imports = [
     ../2configs/hw/AO753.nix
-    #../2configs/consul-server.nix
+    ../2configs/exim-retiolum.nix
     ../2configs/git.nix
     ../2configs/pulse.nix
     ../2configs/xserver
@@ -24,9 +22,6 @@ with lib;
         ];
       };
     }
-    {
-      krebs.exim-retiolum.enable = true;
-    }
     {
       krebs.nginx = {
         enable = true;
-- 
cgit v1.2.3


From a7e1709a466cee24783e20b6219ef5112b00e8c9 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 1 Feb 2016 17:18:07 +0100
Subject: tv nginx-public_html: init

---
 tv/1systems/nomic.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

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

diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 145e9b23..64fe5a63 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -9,6 +9,7 @@ with lib;
     ../2configs/hw/AO753.nix
     ../2configs/exim-retiolum.nix
     ../2configs/git.nix
+    ../2configs/nginx-public_html.nix
     ../2configs/pulse.nix
     ../2configs/xserver
     {
@@ -22,16 +23,6 @@ with lib;
         ];
       };
     }
-    {
-      krebs.nginx = {
-        enable = true;
-        servers.default.locations = [
-          (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
-            alias /home/$1/public_html$2;
-          '')
-        ];
-      };
-    }
     {
       krebs.retiolum = {
         enable = true;
-- 
cgit v1.2.3


From d6ded00d012d4fb2a2a0a824604b25dac35ee349 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 1 Feb 2016 17:32:04 +0100
Subject: tv retiolum: init

---
 tv/1systems/nomic.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

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

diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 64fe5a63..b7e77e97 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -11,6 +11,7 @@ with lib;
     ../2configs/git.nix
     ../2configs/nginx-public_html.nix
     ../2configs/pulse.nix
+    ../2configs/retiolum.nix
     ../2configs/xserver
     {
       tv.iptables = {
@@ -23,15 +24,6 @@ with lib;
         ];
       };
     }
-    {
-      krebs.retiolum = {
-        enable = true;
-        connectTo = [
-          "gum"
-          "pigstarter"
-        ];
-      };
-    }
   ];
 
   boot.initrd.luks = {
-- 
cgit v1.2.3


From bb1dbae8187601cea2ddfbdcdc9baa456bc5b4ab Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 1 Feb 2016 17:40:25 +0100
Subject: tv: open ssh port by default

---
 tv/1systems/nomic.nix | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index b7e77e97..f176a5f2 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -17,7 +17,6 @@ with lib;
       tv.iptables = {
         enable = true;
         input-internet-accept-new-tcp = [
-          "ssh"
           "http"
           "tinc"
           "smtp"
-- 
cgit v1.2.3


From b172630f894362dc32cb6af7d5c9d44902ec5752 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 1 Feb 2016 17:44:19 +0100
Subject: tv retiolum: open tinc port

---
 tv/1systems/nomic.nix | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index f176a5f2..6f2c4182 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -18,7 +18,6 @@ with lib;
         enable = true;
         input-internet-accept-new-tcp = [
           "http"
-          "tinc"
           "smtp"
         ];
       };
-- 
cgit v1.2.3


From d85c70d1d669636fe2fcbb1179dca2c4aecb0802 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 1 Feb 2016 17:46:33 +0100
Subject: tv nginx-public_html: open http port

---
 tv/1systems/nomic.nix | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 6f2c4182..2b71a974 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -17,7 +17,6 @@ with lib;
       tv.iptables = {
         enable = true;
         input-internet-accept-new-tcp = [
-          "http"
           "smtp"
         ];
       };
-- 
cgit v1.2.3


From fe025213ea5c15012fd83f1064269a315a2d576a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 1 Feb 2016 17:50:00 +0100
Subject: tv exim-retiolum: open smtp port to retiolum

---
 tv/1systems/nomic.nix | 8 --------
 1 file changed, 8 deletions(-)

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

diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 2b71a974..37ef204c 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -13,14 +13,6 @@ with lib;
     ../2configs/pulse.nix
     ../2configs/retiolum.nix
     ../2configs/xserver
-    {
-      tv.iptables = {
-        enable = true;
-        input-internet-accept-new-tcp = [
-          "smtp"
-        ];
-      };
-    }
   ];
 
   boot.initrd.luks = {
-- 
cgit v1.2.3