From 681dbaf328eabb5590e8893048acd3391896c115 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Tue, 7 Apr 2020 22:47:40 +0200
Subject: [PATCH] move electrs.onionport option

Only used in secure-node.nix
---
 modules/electrs.nix             | 5 -----
 modules/presets/secure-node.nix | 9 ++++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/electrs.nix b/modules/electrs.nix
index 4ca1cda..1d538f3 100644
--- a/modules/electrs.nix
+++ b/modules/electrs.nix
@@ -44,11 +44,6 @@ in {
       default = 50001;
       description = "RPC port.";
     };
-    onionport = mkOption {
-      type = types.ints.u16;
-      default = 50002;
-      description = "Port on which to listen for tor client connections.";
-    };
     extraArgs = mkOption {
       type = types.separatedString " ";
       default = "";
diff --git a/modules/presets/secure-node.nix b/modules/presets/secure-node.nix
index 56b44e6..ff69bf1 100644
--- a/modules/presets/secure-node.nix
+++ b/modules/presets/secure-node.nix
@@ -21,6 +21,14 @@ let
 in {
   imports = [ ../modules.nix ];
 
+  options = {
+    services.electrs.onionport = mkOption {
+      type = types.ints.u16;
+      default = 50002;
+      description = "Port on which to listen for tor client connections.";
+    };
+  };
+
   config =  {
     # For backwards compatibility only
     nix-bitcoin.secretsDir = mkDefault "/secrets";
@@ -90,7 +98,6 @@ in {
     services.electrs = {
       port = 50001;
       enforceTor = true;
-      onionport = 50002;
       TLSProxy.enable = true;
       TLSProxy.port = 50003;
     };