mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
nixos/taler: explicitly specify configFile
else the executables fail to work.
This commit is contained in:
parent
18f8cabb0a
commit
5db5bd097c
2 changed files with 8 additions and 4 deletions
|
@ -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}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
@ -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}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue