make pppoe/l2tp more consistent

This commit is contained in:
Daniel Barlow 2024-09-03 22:57:45 +01:00
parent 500a3c1025
commit c7bcfbfa34
2 changed files with 17 additions and 17 deletions

View File

@ -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,

View File

@ -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";
}