From e04f8bb993051a831a77ddbff1326cf26e610801 Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 29 May 2025 11:10:14 +0200 Subject: [PATCH] nixos/libeufin: update BASE_URL which is now required to have a valid protocol. --- nixos/modules/services/finance/libeufin/common.nix | 3 ++- nixos/tests/taler/common/nodes.nix | 2 +- nixos/tests/taler/common/scripts.nix | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/finance/libeufin/common.nix b/nixos/modules/services/finance/libeufin/common.nix index d5e72b8ad0c5..4e0a6bffe02f 100644 --- a/nixos/modules/services/finance/libeufin/common.nix +++ b/nixos/modules/services/finance/libeufin/common.nix @@ -35,6 +35,7 @@ libeufinComponent: cfg.settings."libeufin-${libeufinComponent}db-postgres".CONFIG; bankPort = cfg.settings."${if isNexus then "nexus-httpd" else "libeufin-bank"}".PORT; + bankHost = lib.elemAt (lib.splitString "/" cfg.settings.libeufin-bank.BASE_URL) 2; in lib.mkIf cfg.enable { services.libeufin.settings = cfg.settings; @@ -82,7 +83,7 @@ libeufinComponent: args = lib.cli.toGNUCommandLineShell { } { c = configFile; inherit (account) username password name; - payto_uri = "payto://x-taler-bank/bank:${toString bankPort}/${account.username}?receiver-name=${account.name}"; + payto_uri = "payto://x-taler-bank/${bankHost}/${account.username}?receiver-name=${account.name}"; exchange = lib.toLower account.username == "exchange"; }; in diff --git a/nixos/tests/taler/common/nodes.nix b/nixos/tests/taler/common/nodes.nix index 3e8b81ed5179..fcfcb6d6648f 100644 --- a/nixos/tests/taler/common/nodes.nix +++ b/nixos/tests/taler/common/nodes.nix @@ -103,7 +103,7 @@ rec { # WIRE_TYPE = "iban"; X_TALER_BANK_PAYTO_HOSTNAME = "bank:8082"; # IBAN_PAYTO_BIC = "SANDBOXX"; - BASE_URL = "bank:8082"; + BASE_URL = "http://bank:8082/"; # Allow creating new accounts ALLOW_REGISTRATION = "yes"; diff --git a/nixos/tests/taler/common/scripts.nix b/nixos/tests/taler/common/scripts.nix index 3860ae229070..98487c76ccf6 100644 --- a/nixos/tests/taler/common/scripts.nix +++ b/nixos/tests/taler/common/scripts.nix @@ -7,7 +7,7 @@ let cfgNodes = pkgs.callPackage ./nodes.nix { inherit lib; }; - bankConfig = nodes.bank.config.environment.etc."libeufin/libeufin.conf".source; + bankConfig = nodes.bank.environment.etc."libeufin/libeufin.conf".source; inherit (cfgNodes) CURRENCY FIAT_CURRENCY; in