Merge remote-tracking branch 'cd/master'

1 files changed, 29 insertions, 29 deletions

diff --git a/tv/3modules/iptables.nix b/tv/3modules/iptables.nix
index cbf49f577..4924db4f3 100644
--- a/tv/3modules/iptables.nix
+++ b/tv/3modules/iptables.nix
@@ -13,6 +13,11 @@ let
   api = {
     enable = mkEnableOption "tv.iptables";
 
+    accept-echo-request = mkOption {
+      type = with types; nullOr (enum ["internet" "retiolum"]);
+      default = "retiolum";
+    };
+
     input-internet-accept-new-tcp = mkOption {
       type = with types; listOf (either int str);
       default = [];
@@ -43,28 +48,38 @@ let
         Type = "simple";
         RemainAfterExit = true;
         Restart = "always";
-        ExecStart = "@${startScript} tv-iptables_start";
+        SyslogIdentifier = "tv-iptables_start";
+        ExecStart = pkgs.writeDash "tv-iptables_start" ''
+          set -euf
+          iptables-restore < ${rules 4}
+          ip6tables-restore < ${rules 6}
+        '';
       };
     };
   };
 
 
-  accept-new-tcp = port:
-    "-p tcp -m tcp --dport ${port} -m conntrack --ctstate NEW -j ACCEPT";
-
-  rules = iptables-version:
+  rules = iptables-version: let
+    accept-echo-request = {
+      ip4tables = "-p icmp -m icmp --icmp-type echo-request -j ACCEPT";
+      ip6tables = "-p ipv6-icmp -m icmp6 --icmpv6-type echo-request -j ACCEPT";
+    }."ip${toString iptables-version}tables";
+    accept-new-tcp = port:
+      "-p tcp -m tcp --dport ${port} -m conntrack --ctstate NEW -j ACCEPT";
+  in
     pkgs.writeText "tv-iptables-rules${toString iptables-version}" ''
       *nat
       :PREROUTING ACCEPT [0:0]
       :INPUT ACCEPT [0:0]
       :OUTPUT ACCEPT [0:0]
       :POSTROUTING ACCEPT [0:0]
-      ${concatMapStringsSep "\n" (rule: "-A PREROUTING ${rule}") ([]
-        ++ [
-          "! -i retiolum -p tcp -m tcp --dport 22 -j REDIRECT --to-ports 0"
-          "-p tcp -m tcp --dport 11423 -j REDIRECT --to-ports 22"
-        ]
-      )}
+      ${concatMapStringsSep "\n" (rule: "-A PREROUTING ${rule}") [
+        "! -i retiolum -p tcp -m tcp --dport 22 -j REDIRECT --to-ports 0"
+        "-p tcp -m tcp --dport 11423 -j REDIRECT --to-ports 22"
+      ]}
+      ${concatMapStringsSep "\n" (rule: "-A OUTPUT ${rule}") [
+        "-o lo -p tcp -m tcp --dport 11423 -j REDIRECT --to-ports 22"
+      ]}
       COMMIT
       *filter
       :INPUT DROP [0:0]
@@ -76,18 +91,12 @@ let
           "-m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT"
           "-i lo -j ACCEPT"
         ]
+        ++ optional (cfg.accept-echo-request == "internet") accept-echo-request
         ++ map accept-new-tcp (unique (map toString cfg.input-internet-accept-new-tcp))
         ++ ["-i retiolum -j Retiolum"]
       )}
       ${concatMapStringsSep "\n" (rule: "-A Retiolum ${rule}") ([]
-        ++ {
-          ip4tables = [
-            "-p icmp -m icmp --icmp-type echo-request -j ACCEPT"
-          ];
-          ip6tables = [
-            "-p ipv6-icmp -m icmp6 --icmpv6-type echo-request -j ACCEPT"
-          ];
-        }."ip${toString iptables-version}tables"
+        ++ optional (cfg.accept-echo-request == "retiolum") accept-echo-request
         ++ map accept-new-tcp (unique (map toString cfg.input-retiolum-accept-new-tcp))
         ++ {
           ip4tables = [
@@ -104,16 +113,7 @@ let
       )}
       COMMIT
     '';
-
-  startScript = pkgs.writeScript "tv-iptables_start" ''
-    #! /bin/sh
-    set -euf
-    iptables-restore < ${rules 4}
-    ip6tables-restore < ${rules 6}
-  '';
-
-in
-out
+in out
 
 #let
 #  cfg = config.tv.iptables;