liminix

commit c7bcfbfa3463e4c6d04c91d13aed181aedb5e300
parent 500a3c102513ada34da1951d2b55e7895441c808
Author: Daniel Barlow <dan@telent.net>
Date:   Tue,  3 Sep 2024 22:57:45 +0100

make pppoe/l2tp more consistent

Diffstat:
M
modules/ppp/l2tp.nix
 | 
16
++++++++--------
M
modules/ppp/pppoe.nix
 | 
18
+++++++++---------

2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/modules/ppp/l2tp.nix b/modules/ppp/l2tp.nix
@@ -1,12 +1,12 @@
 {
-  liminix
-, lib
-, svc
-, output-template
-, writeAshScript
-, writeText
-, serviceFns
-, xl2tpd
+  lib,
+  liminix,
+  output-template,
+  serviceFns,
+  svc,
+  writeAshScript,
+  writeText,
+  xl2tpd,
 } :
 { lns,
   ppp-options,
diff --git a/modules/ppp/pppoe.nix b/modules/ppp/pppoe.nix
@@ -1,12 +1,12 @@
 {
-  liminix
-, svc
-, lib
-, output-template
-, ppp
-, pppoe
-, writeAshScript
-, serviceFns
+  lib,
+  liminix,
+  output-template,
+  ppp,
+  pppoe,
+  serviceFns,
+  svc,
+  writeAshScript,
 } :
 { interface,
   ppp-options,
@@ -48,6 +48,7 @@ let
           lambda = (o: "output(${builtins.toJSON (o "service")}, ${builtins.toJSON (o "path")})");
         }.${builtins.typeOf o}) o;
     in  o: "{{ ${v o} }}";
+
   ppp-options' =
     ["+ipv6" "noauth"]
     ++ optional debug "debug"
@@ -86,5 +87,4 @@ let
 in svc.secrets.subscriber.build {
   watch = [ username password ];
   inherit service;
-  action = "restart-all";
 }