From c441f091d3923d2624683373b91bf711028e76f5 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sun, 19 Jul 2015 16:12:21 +0200
Subject: 3 tv.iptables: allow numeric ports

---
 3modules/tv/iptables.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/3modules/tv/iptables.nix b/3modules/tv/iptables.nix
index 21cf7732..173e5826 100644
--- a/3modules/tv/iptables.nix
+++ b/3modules/tv/iptables.nix
@@ -14,12 +14,12 @@ let
     enable = mkEnableOption "tv.iptables";
 
     input-internet-accept-new-tcp = mkOption {
-      type = with types; listOf str;
+      type = with types; listOf (either int str);
       default = [];
     };
 
     input-retiolum-accept-new-tcp = mkOption {
-      type = with types; listOf str;
+      type = with types; listOf (either int str);
       default = [];
     };
   };
@@ -76,7 +76,7 @@ let
           "-m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT"
           "-i lo -j ACCEPT"
         ]
-        ++ map accept-new-tcp (unique cfg.input-internet-accept-new-tcp)
+        ++ map accept-new-tcp (unique (map toString cfg.input-internet-accept-new-tcp))
         ++ ["-i retiolum -j Retiolum"]
       )}
       ${concatMapStringsSep "\n" (rule: "-A Retiolum ${rule}") ([]
@@ -88,7 +88,7 @@ let
             "-p ipv6-icmp -m icmp6 --icmpv6-type echo-request -j ACCEPT"
           ];
         }."ip${toString iptables-version}tables"
-        ++ map accept-new-tcp (unique cfg.input-retiolum-accept-new-tcp)
+        ++ map accept-new-tcp (unique (map toString cfg.input-retiolum-accept-new-tcp))
         ++ {
           ip4tables = [
             "-p tcp -j REJECT --reject-with tcp-reset"
-- 
cgit v1.2.3