dan
/
liminix
1
0
Fork 5
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

remove the fixpoint we didn't need

This commit is contained in:
Daniel Barlow 2024-07-15 18:54:04 +01:00
parent 1c3242cab1
commit 75e9f8210c
1 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
examples/l2tp.nix
View File

@ -59,15 +59,14 @@ in rec {
services.wan = services.wan =
let let
z = final : prev: {
controller = longrun rec { controller = longrun rec {
name = "wan-switcher"; name = "wan-switcher";
run = '' run = ''
in_outputs ${name} in_outputs ${name}
exec ${pkgs.s6-rc-round-robin}/bin/s6-rc-round-robin \ exec ${pkgs.s6-rc-round-robin}/bin/s6-rc-round-robin \
-p ${final.proxy.name} \ -p ${proxy.name} \
${lib.concatStringsSep " " ${lib.concatStringsSep " "
(builtins.map (f: f.name) [final.pppoe final.l2tp])} (builtins.map (f: f.name) [pppoe l2tp])}
''; '';
}; };
pppoe = (svc.pppoe.build { pppoe = (svc.pppoe.build {
@ -78,7 +77,7 @@ in rec {
"name" rsecrets.l2tp.name "name" rsecrets.l2tp.name
"password" rsecrets.l2tp.password "password" rsecrets.l2tp.password
]; ];
}).overrideAttrs(o: { inherit (final) controller; }); }).overrideAttrs(o: { inherit controller; });
l2tp = l2tp =
let let
@ -97,25 +96,23 @@ in rec {
ppp-options = [ ppp-options = [
"debug" "+ipv6" "noauth" "debug" "+ipv6" "noauth"
"name" rsecrets.l2tp.name "name" rsecrets.l2tp.name
"connect-delay" "5000"
"password" rsecrets.l2tp.password "password" rsecrets.l2tp.password
]; ];
dependencies = [config.services.lns-address route check-address]; dependencies = [config.services.lns-address route check-address];
}).overrideAttrs(o: { inherit (final) controller; }); }).overrideAttrs(o: { inherit controller; });
proxy = oneshot rec { proxy = oneshot rec {
name = "wan-proxy"; name = "wan-proxy";
inherit (final) controller; inherit controller;
buildInputs = with final; [ pppoe l2tp]; buildInputs = [ pppoe l2tp];
up = '' up = ''
echo start proxy ${name} echo start proxy ${name}
set -x set -x
(in_outputs ${name} (in_outputs ${name}
cp -rv $(output_path ${final.controller} active)/* . cp -rv $(output_path ${controller} active)/* .
) )
''; '';
}; };
}; in proxy;
in (lib.fix (lib.extends z (prev : { }))).proxy;
services.sshd = svc.ssh.build { }; services.sshd = svc.ssh.build { };