From 10ff37466663cfac5067d9df275182840a21a9e7 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 30 Jun 2016 00:52:35 +0200 Subject: tv iptables: add input-*-accept-udp --- tv/1systems/cd.nix | 8 ++++---- tv/1systems/mkdir.nix | 4 ++-- tv/1systems/rmdir.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tv/1systems') 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/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" ]; }; -- cgit v1.2.3 From b9d5d6c50d23e09a088a848c928f516972de8d2d Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 30 Jun 2016 01:05:21 +0200 Subject: tv: use tinc_pre --- tv/1systems/mu.nix | 2 +- tv/1systems/wu.nix | 2 +- tv/1systems/xu.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tv/1systems') 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/wu.nix b/tv/1systems/wu.nix index cebd7c9..6bb5443 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -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..a3a242c 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -163,7 +163,7 @@ with config.krebs.lib; environment.systemPackages = with pkgs; [ ethtool - tinc + tinc_pre iptables #jack2 -- cgit v1.2.3 From ec4abc109415e3362d66bb846614d6548c9acc2f Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 30 Jun 2016 01:34:25 +0200 Subject: xu,wu: s/gnupg21/gnupg1compat+&/ --- tv/1systems/wu.nix | 2 +- tv/1systems/xu.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tv/1systems') diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 6bb5443..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 diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index a3a242c..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 -- cgit v1.2.3