dan/liminix
1
0
Fork 5
Code

add pppoe to gateway profile

Browse Source
This commit is contained in:
Daniel Barlow 2024-03-18 20:58:34 +00:00
parent 0d8abbc314
commit 00bf3446f1
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
examples/rotuer.nix
View File

@ -52,6 +52,13 @@ in rec {
family = "inet"; address ="${secrets.lan.prefix}.1"; prefixLength = 24; family = "inet"; address ="${secrets.lan.prefix}.1"; prefixLength = 24;
}; };
}; };
wan = {
interface = config.hardware.networkInterfaces.wan;
username = secrets.l2tp.name;
password = secrets.l2tp.password;
dhcp6.enable = true;
};
wireless.networks = { wireless.networks = {
telent = { telent = {
interface = config.hardware.networkInterfaces.wlan; interface = config.hardware.networkInterfaces.wlan;
@ -104,23 +111,14 @@ in rec {
domain = secrets.domainName; domain = secrets.domainName;
}; };
services.wan = svc.pppoe.build {
interface = config.hardware.networkInterfaces.wan;
ppp-options = [
"debug" "+ipv6" "noauth"
"name" secrets.l2tp.name
"password" secrets.l2tp.password
];
};
services.resolvconf = oneshot rec { services.resolvconf = oneshot rec {
dependencies = [ services.wan ]; dependencies = [ config.services.wan ];
name = "resolvconf"; name = "resolvconf";
up = '' up = ''
. ${serviceFns} . ${serviceFns}
( in_outputs ${name} ( in_outputs ${name}
echo "nameserver $(output ${services.wan} ns1)" > resolv.conf echo "nameserver $(output ${config.services.wan} ns1)" > resolv.conf
echo "nameserver $(output ${services.wan} ns2)" >> resolv.conf echo "nameserver $(output ${config.services.wan} ns2)" >> resolv.conf
chmod 0444 resolv.conf chmod 0444 resolv.conf
) )
''; '';
@ -135,15 +133,15 @@ in rec {
}; };
services.defaultroute4 = svc.network.route.build { services.defaultroute4 = svc.network.route.build {
via = "$(output ${services.wan} address)"; via = "$(output ${config.services.wan} address)";
target = "default"; target = "default";
dependencies = [ services.wan ]; dependencies = [ config.services.wan ];
}; };
services.defaultroute6 = svc.network.route.build { services.defaultroute6 = svc.network.route.build {
via = "$(output ${services.wan} ipv6-peer-address)"; via = "$(output ${config.services.wan} ipv6-peer-address)";
target = "default"; target = "default";
interface = services.wan; interface = config.services.wan;
}; };
services.firewall = svc.firewall.build { services.firewall = svc.firewall.build {
@ -156,7 +154,7 @@ in rec {
services.dhcp6c = services.dhcp6c =
let client = svc.dhcp6c.client.build { let client = svc.dhcp6c.client.build {
interface = services.wan; interface = config.services.wan;
}; };
in bundle { in bundle {
name = "dhcp6c"; name = "dhcp6c";

25
modules/profiles/gateway.nix
View File

@ -36,6 +36,13 @@ in {
type = types.attrs; type = types.attrs;
}; };
}; };
wan = {
interface = mkOption { type = liminix.lib.types.interface; };
username = mkOption { type = types.str; };
password = mkOption { type = types.str; };
dhcp6.enable = mkOption { type = types.bool; };
};
wireless = mkOption { wireless = mkOption {
type = types.attrsOf types.anything; type = types.attrsOf types.anything;
}; };
@ -64,6 +71,16 @@ in {
primary = config.services.int; primary = config.services.int;
members = cfg.lan.interfaces; members = cfg.lan.interfaces;
}; };
services.wan = svc.pppoe.build {
interface = config.hardware.networkInterfaces.wan;
ppp-options = [
"debug" "+ipv6" "noauth"
"name" cfg.wan.username
"password" cfg.wan.password
];
};
}; };
# services.dns = # services.dns =
@ -87,14 +104,6 @@ in {
# domain = secrets.domainName; # domain = secrets.domainName;
# }; # };
# services.wan = svc.pppoe.build {
# interface = config.hardware.networkInterfaces.wan;
# ppp-options = [
# "debug" "+ipv6" "noauth"
# "name" secrets.l2tp.name
# "password" secrets.l2tp.password
# ];
# };
# services.resolvconf = oneshot rec { # services.resolvconf = oneshot rec {
# dependencies = [ services.wan ]; # dependencies = [ services.wan ];