From 42d2d5de77590e7d6c421a3f7d80126f34646750 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 8 Feb 2016 03:40:41 +0100
Subject: tv.iptables: inline startScript and use SyslogIdentifier

---
 tv/3modules/iptables.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'tv/3modules')

diff --git a/tv/3modules/iptables.nix b/tv/3modules/iptables.nix
index a4ebef44..4924db4f 100644
--- a/tv/3modules/iptables.nix
+++ b/tv/3modules/iptables.nix
@@ -48,7 +48,12 @@ 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}
+        '';
       };
     };
   };
@@ -108,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;
-- 
cgit v1.2.3