Merge fort-nix/nix-bitcoin#638: Minor clightning fixes

e253b89858 clightning: depend on actual bitcoind package (Erik Arvstedt)
b85aac9ba1 clightning: don't cleanup socket on startup (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK e253b89858

Tree-SHA512: 483b1208ff3c7409fddb2cce10f6285cdc7cd17e48742755bcf1b0c8668e4a343acc70f1efcccd3a3d32d172306dfbf0febb31972db636a64e16ed364adbf5ce
This commit is contained in:
Jonas Nick
2023-09-04 19:18:18 +00:00

View File

@@ -165,13 +165,11 @@ in {
]; ];
systemd.services.clightning = { systemd.services.clightning = {
path = [ nbPkgs.bitcoind ]; path = [ bitcoind.package ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
requires = [ "bitcoind.service" ]; requires = [ "bitcoind.service" ];
after = [ "bitcoind.service" ]; after = [ "bitcoind.service" ];
preStart = '' preStart = ''
# The RPC socket has to be removed otherwise we might have stale sockets
rm -f ${cfg.networkDir}/lightning-rpc
umask u=rw,g=r,o= umask u=rw,g=r,o=
{ {
cat ${configFile} cat ${configFile}