diff --git a/modules/bitcoind-rpc-public-whitelist.nix b/modules/bitcoind-rpc-public-whitelist.nix index 966111e..70ce406 100644 --- a/modules/bitcoind-rpc-public-whitelist.nix +++ b/modules/bitcoind-rpc-public-whitelist.nix @@ -58,5 +58,5 @@ "validateaddress" "verifymessage" # Zmq - "getzmqnotifications" + "getzmqnotifications" ] diff --git a/modules/bitcoind.nix b/modules/bitcoind.nix index 028c4ed..a7e2720 100644 --- a/modules/bitcoind.nix +++ b/modules/bitcoind.nix @@ -326,10 +326,10 @@ in { in '' ${optionalString cfg.dataDirReadableByGroup "chmod -R g+rX '${cfg.dataDir}/blocks'"} cfg=$( - cat ${configFile}; + cat ${configFile} ${extraRpcauth} ${/* Enable bitcoin-cli for group 'bitcoin' */ ""} - printf "rpcuser=${cfg.rpc.users.privileged.name}\nrpcpassword="; cat "${secretsDir}/bitcoin-rpcpassword-privileged"; + printf "rpcuser=${cfg.rpc.users.privileged.name}\nrpcpassword="; cat "${secretsDir}/bitcoin-rpcpassword-privileged" echo ${optionalString (cfg.getPublicAddressCmd != "") '' echo "externalip=$(${cfg.getPublicAddressCmd})" diff --git a/modules/clightning.nix b/modules/clightning.nix index cea6267..d62610c 100644 --- a/modules/clightning.nix +++ b/modules/clightning.nix @@ -81,8 +81,7 @@ in { }; cli = mkOption { readOnly = true; - default = pkgs.writeScriptBin "lightning-cli" - '' + default = pkgs.writeScriptBin "lightning-cli" '' ${nbPkgs.clightning}/bin/lightning-cli --lightning-dir='${cfg.dataDir}' "$@" ''; description = "Binary to connect with the clightning instance."; diff --git a/modules/hardware-wallets.nix b/modules/hardware-wallets.nix index 1d1c2b1..e7dea40 100644 --- a/modules/hardware-wallets.nix +++ b/modules/hardware-wallets.nix @@ -51,7 +51,6 @@ in { nix-bitcoin.operator.groups = [ cfg.group ]; }) (mkIf cfg.ledger { - # Ledger Nano S according to https://github.com/LedgerHQ/udev-rules/blob/master/add_udev_rules.sh # Don't use rules from nixpkgs because we want to use our own group. services.udev.packages = lib.singleton (pkgs.writeTextFile { diff --git a/pkgs/lib.nix b/pkgs/lib.nix index 46dba79..c48c30a 100644 --- a/pkgs/lib.nix +++ b/pkgs/lib.nix @@ -30,7 +30,7 @@ let self = { # which is a core requirement for systemd services) # @system-service is defined in src/shared/seccomp-util.c (systemd source) SystemCallFilter = [ "@system-service" "~add_key clone3 get_mempolicy kcmp keyctl mbind move_pages name_to_handle_at personality process_vm_readv process_vm_writev request_key set_mempolicy setns unshare userfaultfd" ]; - SystemCallArchitectures= "native"; + SystemCallArchitectures = "native"; }; # nodejs applications apparently rely on memory write execute