From 28792f79dc1ff0a581dee8dd30f4d49950b2cef7 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Tue, 7 Apr 2020 22:47:32 +0200
Subject: [PATCH] rename nix-bitcoin.nix -> presets/secure-node.nix

---
 examples/configuration.nix                           | 4 ++--
 modules/default.nix                                  | 2 +-
 modules/{nix-bitcoin.nix => presets/secure-node.nix} | 4 ++--
 test/test.nix                                        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename modules/{nix-bitcoin.nix => presets/secure-node.nix} (98%)

diff --git a/examples/configuration.nix b/examples/configuration.nix
index 85bd665..a72ebdc 100644
--- a/examples/configuration.nix
+++ b/examples/configuration.nix
@@ -4,7 +4,7 @@
 
 { config, pkgs, lib, ... }: {
   imports = [
-    <nix-bitcoin/modules/nix-bitcoin.nix>
+    <nix-bitcoin/modules/presets/secure-node.nix>
 
     # FIXME: The hardened kernel profile improves security but
     # decreases performance by ~50%.
@@ -26,7 +26,7 @@
   ### BITCOIND
   # Bitcoind is enabled by default if nix-bitcoin is enabled
   #
-  # You can override default settings from nix-bitcoin.nix as follows
+  # You can override default settings from secure-node.nix as follows
   # services.bitcoind.prune = lib.mkForce 100000;
   #
   # You can add options that are not defined in modules/bitcoind.nix as follows
diff --git a/modules/default.nix b/modules/default.nix
index 6664741..2ca1ebe 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -7,7 +7,7 @@
   lightning-charge = ./lightning-charge.nix;
   liquid = ./liquid.nix;
   nanopos = ./nanopos.nix;
-  nix-bitcoin = ./nix-bitcoin.nix;
+  presets.secure-node = ./presets/secure-node.nix;
   nix-bitcoin-webindex = ./nix-bitcoin-webindex.nix;
   spark-wallet = ./spark-wallet.nix;
   recurring-donations = ./recurring-donations.nix;
diff --git a/modules/nix-bitcoin.nix b/modules/presets/secure-node.nix
similarity index 98%
rename from modules/nix-bitcoin.nix
rename to modules/presets/secure-node.nix
index 1b71e42..aae32f5 100644
--- a/modules/nix-bitcoin.nix
+++ b/modules/presets/secure-node.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
   cfg = config.services.nix-bitcoin;
-  operatorCopySSH = pkgs.writeText "operator-copy-ssh.sh" '' 
+  operatorCopySSH = pkgs.writeText "operator-copy-ssh.sh" ''
     mkdir -p ${config.users.users.operator.home}/.ssh
     if [ -e "${config.users.users.root.home}/.vbox-nixops-client-key" ]; then
       cp ${config.users.users.root.home}/.vbox-nixops-client-key ${config.users.users.operator.home}/.ssh/authorized_keys
@@ -15,7 +15,7 @@ let
     chown -R operator ${config.users.users.operator.home}/.ssh
   '';
 in {
-  imports = [ ./modules.nix ];
+  imports = [ ../modules.nix ];
 
   options.services.nix-bitcoin = {
     enable = mkOption {
diff --git a/test/test.nix b/test/test.nix
index 918ce38..d8557c5 100644
--- a/test/test.nix
+++ b/test/test.nix
@@ -10,7 +10,7 @@ import ./make-test.nix rec {
 
   machine = { pkgs, lib, ... }: with lib; {
     imports = [
-      ../modules/nix-bitcoin.nix
+      ../modules/presets/secure-node.nix
       ../modules/secrets/generate-secrets.nix
       # using the hardened profile increases total test duration by ~50%, so disable it for now
       # hardened