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

nixos/taler: explicitly specify configFile

Browse source 
else the executables fail to work.
This commit is contained in:
eljamm 2025-05-29 10:49:45 +02:00 • committed by Valentin Gagarin
parent 18f8cabb0a
commit 5db5bd097c
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/services/finance/taler/exchange.nix
View file

@ -25,6 +25,8 @@ let
"secmod-eddsa" "secmod-eddsa"
"secmod-rsa" "secmod-rsa"
]; ];
configFile = config.environment.etc."taler/taler.conf".source;
in in
{ {
@ -140,14 +142,14 @@ in
lib.pipe servicesDB [ lib.pipe servicesDB [
(map (name: '' (map (name: ''
GRANT SELECT,INSERT,UPDATE${deletePerm name} ON ALL TABLES IN SCHEMA exchange TO "taler-exchange-${name}"; GRANT SELECT,INSERT,UPDATE${deletePerm name} ON ALL TABLES IN SCHEMA exchange TO "taler-exchange-${name}";
GRANT USAGE ON SCHEMA exchange TO "taler-exchange-${name}"; GRANT USAGE ON ALL SEQUENCES IN SCHEMA exchange TO "taler-exchange-${name}";
'')) ''))
lib.concatStrings lib.concatStrings
] ]
); );
in in
'' ''
${lib.getExe' cfg.package "taler-exchange-dbinit"} ${lib.getExe' cfg.package "taler-exchange-dbinit"} -c ${configFile}
psql -U taler-exchange-httpd -f ${dbScript} psql -U taler-exchange-httpd -f ${dbScript}
''; '';
}; };

6
nixos/modules/services/finance/taler/merchant.nix
View file

@ -19,6 +19,8 @@ let
"depositcheck" "depositcheck"
"exchange" "exchange"
]; ];
configFile = config.environment.etc."taler/taler.conf".source;
in in
{ {
imports = [ imports = [
@ -95,13 +97,13 @@ in
lib.concatStrings ( lib.concatStrings (
map (name: '' map (name: ''
GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA merchant TO "taler-merchant-${name}"; GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA merchant TO "taler-merchant-${name}";
GRANT USAGE ON SCHEMA merchant TO "taler-merchant-${name}"; GRANT USAGE ON ALL SEQUENCES IN SCHEMA merchant TO "taler-merchant-${name}";
'') servicesDB '') servicesDB
) )
); );
in in
'' ''
${lib.getExe' cfg.package "taler-merchant-dbinit"} ${lib.getExe' cfg.package "taler-merchant-dbinit"} -c ${configFile}
psql -U taler-${talerComponent}-httpd -f ${dbScript} psql -U taler-${talerComponent}-httpd -f ${dbScript}
''; '';
}; };