Merge #292: joinmarket: always synchronize secrets.jm-wallet-password

ed636dd070 joinmarket: always synchronize secrets.jm-wallet-password (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK ed636dd070

Tree-SHA512: 8024f29f98a87991701dcdb7576c4b3b72c859373153b9281b8a4bba179a33aa39a7496ecd373c0251c8d9c36e1fc7c768a2dcc228aa006bab461f8cbc5d7b0d
This commit is contained in:
Jonas Nick 2020-12-30 19:18:47 +00:00
commit da674d1ccf
No known key found for this signature in database
GPG Key ID: 4861DBF262123605

View File

@ -196,11 +196,11 @@ in {
ReadWritePaths = "${cfg.dataDir}"; ReadWritePaths = "${cfg.dataDir}";
} // nix-bitcoin-services.allowTor; } // nix-bitcoin-services.allowTor;
}; };
nix-bitcoin.secrets.jm-wallet-password.user = cfg.user;
} }
(mkIf cfg.yieldgenerator.enable { (mkIf cfg.yieldgenerator.enable {
nix-bitcoin.secrets.jm-wallet-password.user = cfg.user;
systemd.services.joinmarket-yieldgenerator = let systemd.services.joinmarket-yieldgenerator = let
ygDefault = "${nbPkgs.joinmarket}/bin/jm-yg-privacyenhanced"; ygDefault = "${nbPkgs.joinmarket}/bin/jm-yg-privacyenhanced";
ygBinary = if cfg.yieldgenerator.customParameters == "" then ygBinary = if cfg.yieldgenerator.customParameters == "" then