Merge remote-tracking branch 'cd/master'

6 files changed, 13 insertions, 13 deletions

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 32d956b..a46edb4 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -18,7 +18,7 @@ with config.krebs.lib;
         enable = true;
         ssl_cert = ../Zcerts/charybdis_cd.crt.pem;
       };
-      tv.iptables.input-retiolum-accept-new-tcp = [
+      tv.iptables.input-retiolum-accept-tcp = [
         config.tv.charybdis.port
         config.tv.charybdis.sslport
       ];
@@ -28,14 +28,14 @@ with config.krebs.lib;
         enable = true;
         hosts = [ "jabber.viljetic.de" ];
       };
-      tv.iptables.input-internet-accept-new-tcp = [
+      tv.iptables.input-internet-accept-tcp = [
         "xmpp-client"
         "xmpp-server"
       ];
     }
     {
       krebs.github-hosts-sync.enable = true;
-      tv.iptables.input-internet-accept-new-tcp =
+      tv.iptables.input-internet-accept-tcp =
         singleton config.krebs.github-hosts-sync.port;
     }
     {
@@ -57,7 +57,7 @@ with config.krebs.lib;
           root ${pkgs.viljetic-pages};
         '');
       };
-      tv.iptables.input-internet-accept-new-tcp = singleton "http";
+      tv.iptables.input-internet-accept-tcp = singleton "http";
     }
   ];
 
diff --git a/tv/1systems/mkdir.nix b/tv/1systems/mkdir.nix
index f46ed95..dcec1e2 100644
--- a/tv/1systems/mkdir.nix
+++ b/tv/1systems/mkdir.nix
@@ -22,12 +22,12 @@ in
     {
       tv.iptables = {
         enable = true;
-        input-internet-accept-new-tcp = [
+        input-internet-accept-tcp = [
           "ssh"
           "tinc"
           "smtp"
         ];
-        input-retiolum-accept-new-tcp = [
+        input-retiolum-accept-tcp = [
           "http"
         ];
       };
diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix
index 06da15e..ec208a0 100644
--- a/tv/1systems/mu.nix
+++ b/tv/1systems/mu.nix
@@ -76,7 +76,7 @@ with config.krebs.lib;
 
   environment.systemPackages = with pkgs; [
     slock
-    tinc
+    tinc_pre
     iptables
     vim
     gimp
diff --git a/tv/1systems/rmdir.nix b/tv/1systems/rmdir.nix
index 25fae2c..34f9260 100644
--- a/tv/1systems/rmdir.nix
+++ b/tv/1systems/rmdir.nix
@@ -22,12 +22,12 @@ in
     {
       tv.iptables = {
         enable = true;
-        input-internet-accept-new-tcp = [
+        input-internet-accept-tcp = [
           "ssh"
           "tinc"
           "smtp"
         ];
-        input-retiolum-accept-new-tcp = [
+        input-retiolum-accept-tcp = [
           "http"
         ];
       };
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index cebd7c9..d115e27 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -38,7 +38,7 @@ with config.krebs.lib;
         dic
         file
         get
-        gnupg21
+        gnupg1compat
         haskellPackages.hledger
         htop
         jq
@@ -153,7 +153,7 @@ with config.krebs.lib;
 
   environment.systemPackages = with pkgs; [
     ethtool
-    tinc
+    tinc_pre
     iptables
     #jack2
   ];
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 6ba7ab3..7277f5c 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -49,7 +49,7 @@ with config.krebs.lib;
         cac-api
         dic
         file
-        gnupg21
+        gnupg1compat
         haskellPackages.hledger
         htop
         jq
@@ -163,7 +163,7 @@ with config.krebs.lib;
 
   environment.systemPackages = with pkgs; [
     ethtool
-    tinc
+    tinc_pre
     iptables
     #jack2