From e66636ef0e2f35699516594acfb1b265377f4726 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Thu, 29 Oct 2020 21:20:34 +0100
Subject: [PATCH] liquidd: use type str for rpcbind

---
 modules/liquid.nix          | 8 ++++----
 modules/netns-isolation.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/liquid.nix b/modules/liquid.nix
index 8d59b72..e315c87 100644
--- a/modules/liquid.nix
+++ b/modules/liquid.nix
@@ -26,8 +26,8 @@ let
       (rpcUser: "rpcauth=${rpcUser.name}:${rpcUser.passwordHMAC}")
       (attrValues cfg.rpc.users)
     }
-    ${lib.concatMapStrings (rpcbind: "rpcbind=${rpcbind}\n") cfg.rpcbind}
-    rpcconnect=${builtins.elemAt cfg.rpcbind 0}
+    rpcbind=${cfg.rpcbind}
+    rpcconnect=${cfg.rpcbind}
     ${lib.concatMapStrings (rpcallowip: "rpcallowip=${rpcallowip}\n") cfg.rpcallowip}
     ${optionalString (cfg.rpcuser != null) "rpcuser=${cfg.rpcuser}"}
     ${optionalString (cfg.rpcpassword != null) "rpcpassword=${cfg.rpcpassword}"}
@@ -126,8 +126,8 @@ in {
       };
 
       rpcbind = mkOption {
-        type = types.listOf types.str;
-        default = [ "127.0.0.1" ];
+        type = types.str;
+        default = "127.0.0.1";
         description = ''
           Bind to given address to listen for JSON-RPC connections.
         '';
diff --git a/modules/netns-isolation.nix b/modules/netns-isolation.nix
index 1aa363a..bf4eaf7 100644
--- a/modules/netns-isolation.nix
+++ b/modules/netns-isolation.nix
@@ -270,7 +270,7 @@ in {
 
     services.liquidd = {
       bind = netns.liquidd.address;
-      rpcbind = [ netns.liquidd.address ];
+      rpcbind = netns.liquidd.address;
       rpcallowip = [
         bridgeIp # For operator user
         netns.liquidd.address