From 301bb91ae51cef360bd280a37f7453c8e88aa4aa Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Wed, 4 Mar 2020 18:08:50 +0100 Subject: [PATCH] simplify setting high-memory options --- modules/electrs.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/electrs.nix b/modules/electrs.nix index 59f46b4..6d199ce 100644 --- a/modules/electrs.nix +++ b/modules/electrs.nix @@ -5,8 +5,6 @@ let cfg = config.services.electrs; inherit (config) nix-bitcoin-services; secretsDir = config.nix-bitcoin.secretsDir; - index-batch-size = "${if cfg.high-memory then "" else "--index-batch-size=10"}"; - jsonrpc-import = "${if cfg.high-memory then "" else "--jsonrpc-import"}"; in { imports = [ (mkRenamedOptionModule [ "services" "electrs" "nginxport" ] [ "services" "electrs" "TLSProxy" "port" ]) @@ -73,7 +71,7 @@ in { preStart = '' mkdir -m 0770 -p ${cfg.dataDir} chown -R '${cfg.user}:${cfg.group}' ${cfg.dataDir} - echo "${pkgs.nix-bitcoin.electrs}/bin/electrs -vvv ${index-batch-size} ${jsonrpc-import} --timestamp --db-dir ${cfg.dataDir} --daemon-dir /var/lib/bitcoind --cookie=${config.services.bitcoind.rpcuser}:$(cat ${secretsDir}/bitcoin-rpcpassword) --electrum-rpc-addr=127.0.0.1:${toString cfg.port}" > /run/electrs/startscript.sh + echo "${pkgs.nix-bitcoin.electrs}/bin/electrs -vvv ${optionalString (!cfg.high-memory) "--jsonrpc-import --index-batch-size=10"} --timestamp --db-dir ${cfg.dataDir} --daemon-dir /var/lib/bitcoind --cookie=${config.services.bitcoind.rpcuser}:$(cat ${secretsDir}/bitcoin-rpcpassword) --electrum-rpc-addr=127.0.0.1:${toString cfg.port}" > /run/electrs/startscript.sh ''; serviceConfig = rec { RuntimeDirectory = "electrs";