From 1f8fe310d065fc744a455d205af9f9a9c9109d97 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Tue, 7 Apr 2020 23:05:06 +0200
Subject: [PATCH] remove option 'configFileOption'

It doesn't make sense for bitcoind users to completely redefine their
config file. Also, it's poorly named and the description is faulty.

This is a breaking change, but this option has probably no actual users.
---
 modules/bitcoind.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/bitcoind.nix b/modules/bitcoind.nix
index 0620e6b..08258a8 100644
--- a/modules/bitcoind.nix
+++ b/modules/bitcoind.nix
@@ -68,11 +68,6 @@ in {
         default = "/var/lib/bitcoind";
         description = "The data directory for bitcoind.";
       };
-      configFileOption = mkOption {
-        type = types.path;
-        default = configFile;
-        description = "The data directory for bitcoind.";
-      };
       user = mkOption {
         type = types.str;
         default = "bitcoin";
@@ -258,7 +253,7 @@ in {
         if ! test -e ${cfg.dataDir}/blocks; then
           mkdir -m 0770 -p '${cfg.dataDir}/blocks'
         fi
-        cp '${cfg.configFileOption}' '${cfg.dataDir}/bitcoin.conf'
+        cp '${configFile}' '${cfg.dataDir}/bitcoin.conf'
         chmod o-rw  '${cfg.dataDir}/bitcoin.conf'
         chown -R '${cfg.user}:${cfg.group}' '${cfg.dataDir}'
         echo "rpcpassword=$(cat ${config.nix-bitcoin.secretsDir}/bitcoin-rpcpassword)" >> '${cfg.dataDir}/bitcoin.conf'