aiolabs/nix-bitcoin
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge fort-nix/nix-bitcoin#745: lnd: make ExecStartPost extensible

Browse source 
ca96e1959e lnd: make `ExecStartPost` extensible (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK ca96e1959e

Tree-SHA512: 6f0d9f6adbb81b4f58f03c2ab2a70c1f8dc5148f8aba3ea93be68d8be0236edcca7087e673a998052ec3c390ff78b6c009d16ad22f9e600e5c9a683e73f16580
This commit is contained in:
Jonas Nick 2024-11-08 08:07:11 +00:00
commit 667dae2b39
No known key found for this signature in database
GPG key ID: 4861DBF262123605
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/lnd.nix
View file

@ -262,9 +262,8 @@ in {
ExecStartPost = let ExecStartPost = let
curl = "${pkgs.curl}/bin/curl -fsS --cacert ${cfg.certPath}"; curl = "${pkgs.curl}/bin/curl -fsS --cacert ${cfg.certPath}";
restUrl = "https://${nbLib.addressWithPort cfg.restAddress cfg.restPort}/v1"; restUrl = "https://${nbLib.addressWithPort cfg.restAddress cfg.restPort}/v1";
in
# Setting macaroon permissions for other users needs root permissions # Setting macaroon permissions for other users needs root permissions
nbLib.rootScript "lnd-create-macaroons" '' script = nbLib.rootScript "lnd-create-macaroons" ''
umask ug=r,o= umask ug=r,o=
${lib.concatMapStrings (macaroon: '' ${lib.concatMapStrings (macaroon: ''
echo "Create custom macaroon ${macaroon}" echo "Create custom macaroon ${macaroon}"
@ -278,6 +277,9 @@ in {
chown ${cfg.macaroons.${macaroon}.user}: "$macaroonPath" chown ${cfg.macaroons.${macaroon}.user}: "$macaroonPath"
'') (attrNames cfg.macaroons)} '') (attrNames cfg.macaroons)}
''; '';
in [
script
];
} // nbLib.allowedIPAddresses cfg.tor.enforce; } // nbLib.allowedIPAddresses cfg.tor.enforce;
}; };