diff --git a/modules/ppp/l2tp.nix b/modules/ppp/l2tp.nix index 0ac4d42..5f37e8b 100644 --- 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 index e775f2a..d966927 100644 --- 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"; }