mob next [ci-skip] [ci skip] [skip ci]

lastFile:modules/clan/phonebox/default.nix

inventories/default.nix

@@ -109,12 +109,6 @@
           roles.default.machines."adhil".settings = {
             ata-ethernet-iface = "end0";
           };
-          roles.default.machines."rigel".settings = {
-            extraClientNumbers = [
-              "01"
-              "02"
-            ];
-          };
         };
 
         pocket-id = {

modules/clan/phonebox/default.nix

@@ -1,4 +1,7 @@
-{ clanLib, ... }:
+{
+  clanLib,
+  ...
+}:
 {
   _class = "clan.service";
   manifest.name = "phonebox";
@@ -14,10 +17,10 @@
           description = "An Ethernet interface that connect to ATA box.";
           default = "enp2s0";
         };
-        options.extraClientNumbers = lib.mkOption {
-          type = with lib.types; listOf str;
-          description = "List of client suffix number.";
-          default = [ ];
+        options.ownerName = lib.mkOption {
+          type = lib.types.str;
+          description = "";
+          default = "";
         };
       };
     perInstance =
@@ -27,6 +30,7 @@
         ...
       }:
       {
+
         nixosModule =
           {
             lib,
@@ -39,12 +43,42 @@
               propagatedNativeBuildInputs = [ pkgs.spandsp3 ];
             });
 
+            machines = lib.attrNames roles.default.machines;
+
             user = "asterisk";
             faxDir = "/run/asterisk/fax";
             rtpPortFrom = 10000;
             rtpPortTo = 20000;
             ata-interface = settings.ata-ethernet-iface;
 
+            contactList = builtins.map (machineName: {
+              name = "${clanLib.getPublicValue {
+                flake = config.clan.core.settings.directory;
+                machine = machineName;
+                generator = "phonebox";
+                file = "owner-name";
+                default = null;
+              }}";
+              number = "${
+                (clanLib.getPublicValue {
+                  flake = config.clan.core.settings.directory;
+                  machine = machineName;
+                  generator = "phonebox";
+                  file = "server-prefix-number";
+                  default = null;
+                })
+                (
+                  clanLib.getPublicValue {
+                    flake = config.clan.core.settings.directory;
+                    machine = machineName;
+                    generator = "phonebox";
+                    file = "ata-local-number";
+                    default = null;
+                  }
+                )
+              }";
+            }) machines;
+
             genServerSIPEndpoint =
               { hostname, address }:
               ''
@@ -74,22 +108,6 @@
                 max_contacts=1
               '';
 
-            genLocalSIPEndpointV6 =
-              { localNumber }:
-              ''
-                [${localNumber}](internal_endpoint)
-                transport=transport-udp6
-                aors=${localNumber}
-                auth=${localNumber}
-
-                [${localNumber}](userpass_auth)
-                username=${localNumber}
-                password=${localNumber}
-
-                [${localNumber}](dynamiic_aor)
-                max_contacts=1
-              '';
-
             genLocalExtenConf =
               { localNumber }:
               ''
@@ -123,10 +141,11 @@
                 throw "clanService/yggdrasil is required";
           in
           {
-            clan.core.vars.generators.phonebox = {
+            clan.core.vars.generators.phonebox = builtins.break {
               files = {
                 server-prefix-number.secret = false;
                 ata-local-number.secret = false;
+                owner-name.secret = false;
               };
 
               prompts = {
@@ -138,11 +157,16 @@
                   type = "line";
                   description = "Local suffix number: indicate local number on the server [XX00]";
                 };
+                owner-name = {
+                  type = "line";
+                  description = "The owner's name for this unit";
+                };
               };
 
               script = ''
                 cat $prompts/server-prefix-number > $out/server-prefix-number
                 cat $prompts/ata-local-number > $out/ata-local-number
+                cat $prompts/owner-name > $out/owner-name
               '';
             };
 
@@ -220,7 +244,6 @@
               package = lib.mkDefault asterisk;
               confFiles =
                 let
-                  machines = lib.attrNames roles.default.machines;
                   nodes = builtins.foldl' (
                     nodes: name:
                     nodes
@@ -305,9 +328,6 @@
                     + (genLocalExtenConf {
                       localNumber = config.clan.core.vars.generators.phonebox.files.ata-local-number.value;
                     })
-                    + lib.concatStringsSep "\n" (
-                      builtins.map (number: genLocalExtenConf { localNumber = number; }) settings.extraClientNumbers
-                    )
                     + serverConf;
 
                   "rtp.conf" = ''
@@ -339,7 +359,6 @@
 
                       [base_endpoint](!)
                       type=endpoint
-                      transport=transport-udp
                       disallow=all
                       allow=ulaw,alaw,g722,gsm
                       direct_media=no
@@ -362,9 +381,6 @@
                     + (genLocalSIPEndpoint {
                       localNumber = config.clan.core.vars.generators.phonebox.files.ata-local-number.value;
                     })
-                    + lib.concatStringsSep "\n" (
-                      builtins.map (number: genLocalSIPEndpointV6 { localNumber = number; }) settings.extraClientNumbers
-                    )
                     + serverConf;
                 };
             };