generalise profile.gateway.wan so not just pppoe

2024-07-16 22:10:09 +01:00
parent 3012c91b47
commit 7f9cae9d5c
3 changed files with 24 additions and 8 deletions
--- a/modules/profiles/gateway.nix
+++ b/modules/profiles/gateway.nix
@@ -52,8 +52,6 @@ in {

    wan = {
      interface = mkOption { type = liminix.lib.types.interface; };
-      username = mkOption { type = types.str; };
-      password =  mkOption { type = types.str; };
      dhcp6.enable = mkOption { type = types.bool; };
    };

@@ -86,9 +84,7 @@ in {
      members = cfg.lan.interfaces;
    };

-    services.wan = svc.pppoe.build {
-      inherit (cfg.wan) interface username password;
-    };
+    services.wan = cfg.wan.interface;

    services.packet_forwarding = svc.network.forward.build { };