From 923939fe573171664ec8c4f59056a3b35fec511d Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 5 Aug 2019 15:11:27 +0000 Subject: [PATCH] Clarify liquid/elements relation --- configuration.nix | 7 ++++--- modules/liquid.nix | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/configuration.nix b/configuration.nix index 9421eb6..5d2615c 100644 --- a/configuration.nix +++ b/configuration.nix @@ -43,10 +43,11 @@ # services.electrs.enable = true; ### LIQUIDD - # Enable this module to use liquidd, a daemon for an inter-exchange + # Enable this module to use Liquid, a sidechain for an inter-exchange # settlement network linking together cryptocurrency exchanges and - # institutions around the world. - # services.liquidd.enable = true; + # institutions around the world. Liquid is accessed with the elements-cli + # tool run as user operator. + services.liquidd.enable = true; ### LIGHTNING CHARGE # Enable this module to use lightning-charge, a simple drop-in solution for diff --git a/modules/liquid.nix b/modules/liquid.nix index 3be3dd3..10ba050 100644 --- a/modules/liquid.nix +++ b/modules/liquid.nix @@ -7,6 +7,7 @@ let cfg = config.services.liquidd; pidFile = "${cfg.dataDir}/liquidd.pid"; configFile = pkgs.writeText "elements.conf" '' + chain=liquidv1 ${optionalString cfg.testnet "testnet=1"} ${optionalString (cfg.dbCache != null) "dbcache=${toString cfg.dbCache}"} ${optionalString (cfg.prune != null) "prune=${toString cfg.prune}"} @@ -60,7 +61,7 @@ in { options = { services.liquidd = { - enable = mkEnableOption "Liquid daemon"; + enable = mkEnableOption "Liquid sidechain"; extraConfig = mkOption { type = types.lines; @@ -181,7 +182,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ pkgs.elementsd ]; systemd.services.liquidd = { - description = "Liquid daemon"; + description = "Elements daemon providing access to the Liquid sidechain"; requires = [ "liquid-rpcpassword-key.service" ]; after = [ "network.target" "liquid-rpcpassword-key.service" ]; wantedBy = [ "multi-user.target" ]; @@ -216,7 +217,7 @@ in { name = cfg.user; group = cfg.group; extraGroups = [ "keys" ]; - description = "Liquid daemon user"; + description = "Liquid sidechain user"; home = cfg.dataDir; }; users.groups.${cfg.group} = {