From 188c893e97a019371a09174a188f4d1cf74c5b8d Mon Sep 17 00:00:00 2001 From: kurogeek Date: Fri, 5 Dec 2025 14:14:43 +0700 Subject: [PATCH] phone number scheme change to 2 digits prefix and 2 digits local --- modules/clan/phonebox/default.nix | 19 +++++++++++++------ .../neptune/phonebox/ata-local-number/value | 2 +- .../phonebox/server-prefix-number/value | 2 +- .../rigel/phonebox/ata-local-number/value | 2 +- .../rigel/phonebox/server-prefix-number/value | 2 +- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/modules/clan/phonebox/default.nix b/modules/clan/phonebox/default.nix index 38dff2b..2e6c713 100644 --- a/modules/clan/phonebox/default.nix +++ b/modules/clan/phonebox/default.nix @@ -68,9 +68,17 @@ exten => ${localNumber},1,Dial(PJSIP/${localNumber},20) ''; genExtentConf = - { prefixNumber, hostname }: + { + prefixNumber, + hostname, + localNumber, + }: + let + replaceWithX = + ln: builtins.concatStringsSep "" (builtins.genList (_: "X") (builtins.stringLength ln)); + in '' - exten => _${prefixNumber}XXX,1,Dial(PJSIP/''${EXTEN:1}@${hostname},30) + exten => _${prefixNumber}${replaceWithX localNumber},1,Dial(PJSIP/''${EXTEN:1}@${hostname},30) ''; getYggdrasilIP = @@ -102,12 +110,12 @@ server-prefix-number = { persist = true; type = "line"; - description = "Server prefix number: the first number of [X000]"; + description = "Server prefix number: indicate server to connect to [10XX]"; }; ata-local-number = { persist = true; type = "line"; - description = "Local suffix number: 3 last number of [0XXX]"; + description = "Local suffix number: indicate local number on the server [XX00]"; }; ata-password = { persist = true; @@ -259,8 +267,7 @@ config: node: config + (genExtentConf { - prefixNumber = node.prefixNumber; - hostname = node.hostname; + inherit (node) prefixNumber hostname localNumber; }) ) "" nodes; in diff --git a/vars/per-machine/neptune/phonebox/ata-local-number/value b/vars/per-machine/neptune/phonebox/ata-local-number/value index 0f30166..857f065 100644 --- a/vars/per-machine/neptune/phonebox/ata-local-number/value +++ b/vars/per-machine/neptune/phonebox/ata-local-number/value @@ -1 +1 @@ -001 \ No newline at end of file +00 \ No newline at end of file diff --git a/vars/per-machine/neptune/phonebox/server-prefix-number/value b/vars/per-machine/neptune/phonebox/server-prefix-number/value index 56a6051..9a03714 100644 --- a/vars/per-machine/neptune/phonebox/server-prefix-number/value +++ b/vars/per-machine/neptune/phonebox/server-prefix-number/value @@ -1 +1 @@ -1 \ No newline at end of file +10 \ No newline at end of file diff --git a/vars/per-machine/rigel/phonebox/ata-local-number/value b/vars/per-machine/rigel/phonebox/ata-local-number/value index 0f30166..857f065 100644 --- a/vars/per-machine/rigel/phonebox/ata-local-number/value +++ b/vars/per-machine/rigel/phonebox/ata-local-number/value @@ -1 +1 @@ -001 \ No newline at end of file +00 \ No newline at end of file diff --git a/vars/per-machine/rigel/phonebox/server-prefix-number/value b/vars/per-machine/rigel/phonebox/server-prefix-number/value index d8263ee..2edeafb 100644 --- a/vars/per-machine/rigel/phonebox/server-prefix-number/value +++ b/vars/per-machine/rigel/phonebox/server-prefix-number/value @@ -1 +1 @@ -2 \ No newline at end of file +20 \ No newline at end of file