movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/libeufin: update BASE_URL

Browse source 
which is now required to have a valid protocol.
This commit is contained in:
eljamm 2025-05-29 11:10:14 +02:00 • committed by Valentin Gagarin
parent 276fca3265
commit e04f8bb993
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/services/finance/libeufin/common.nix
View file

@ -35,6 +35,7 @@ libeufinComponent:
cfg.settings."libeufin-${libeufinComponent}db-postgres".CONFIG; cfg.settings."libeufin-${libeufinComponent}db-postgres".CONFIG;
bankPort = cfg.settings."${if isNexus then "nexus-httpd" else "libeufin-bank"}".PORT; 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 in
lib.mkIf cfg.enable { lib.mkIf cfg.enable {
services.libeufin.settings = cfg.settings; services.libeufin.settings = cfg.settings;
@ -82,7 +83,7 @@ libeufinComponent:
args = lib.cli.toGNUCommandLineShell { } { args = lib.cli.toGNUCommandLineShell { } {
c = configFile; c = configFile;
inherit (account) username password name; 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"; exchange = lib.toLower account.username == "exchange";
}; };
in in

2
nixos/tests/taler/common/nodes.nix
View file

@ -103,7 +103,7 @@ rec {
# WIRE_TYPE = "iban"; # WIRE_TYPE = "iban";
X_TALER_BANK_PAYTO_HOSTNAME = "bank:8082"; X_TALER_BANK_PAYTO_HOSTNAME = "bank:8082";
# IBAN_PAYTO_BIC = "SANDBOXX"; # IBAN_PAYTO_BIC = "SANDBOXX";
BASE_URL = "bank:8082"; BASE_URL = "http://bank:8082/";
# Allow creating new accounts # Allow creating new accounts
ALLOW_REGISTRATION = "yes"; ALLOW_REGISTRATION = "yes";

2
nixos/tests/taler/common/scripts.nix
View file

@ -7,7 +7,7 @@
let let
cfgNodes = pkgs.callPackage ./nodes.nix { inherit lib; }; 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; inherit (cfgNodes) CURRENCY FIAT_CURRENCY;
in in