dan/liminix
1
0
Fork 5
Code

make pppoe/l2tp more consistent

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/ppp/l2tp.nix
View File

@ -1,12 +1,12 @@
{ {
liminix lib,
, lib liminix,
, svc output-template,
, output-template serviceFns,
, writeAshScript svc,
, writeText writeAshScript,
, serviceFns writeText,
, xl2tpd xl2tpd,
} : } :
{ lns, { lns,
ppp-options, ppp-options,

18
modules/ppp/pppoe.nix
View File

@ -1,12 +1,12 @@
{ {
liminix lib,
, svc liminix,
, lib output-template,
, output-template ppp,
, ppp pppoe,
, pppoe serviceFns,
, writeAshScript svc,
, serviceFns writeAshScript,
} : } :
{ interface, { interface,
ppp-options, ppp-options,
@ -48,6 +48,7 @@ let
lambda = (o: "output(${builtins.toJSON (o "service")}, ${builtins.toJSON (o "path")})"); lambda = (o: "output(${builtins.toJSON (o "service")}, ${builtins.toJSON (o "path")})");
}.${builtins.typeOf o}) o; }.${builtins.typeOf o}) o;
in o: "{{ ${v o} }}"; in o: "{{ ${v o} }}";
ppp-options' = ppp-options' =
["+ipv6" "noauth"] ["+ipv6" "noauth"]
++ optional debug "debug" ++ optional debug "debug"
@ -86,5 +87,4 @@ let
in svc.secrets.subscriber.build { in svc.secrets.subscriber.build {
watch = [ username password ]; watch = [ username password ];
inherit service; inherit service;
action = "restart-all";
} }