From d65cb50f508abaed81c02e61f3f625912cf34820 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Tue, 2 Apr 2019 15:43:13 +0000 Subject: [PATCH] Move network*.nix files to new network directory --- README.md | 2 +- docs/install.md | 6 +++--- network-libvirtd.nix => network/network-libvirtd.nix | 0 network-vbox.nix => network/network-vbox.nix | 0 network.nix => network/network.nix | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename network-libvirtd.nix => network/network-libvirtd.nix (100%) rename network-vbox.nix => network/network-vbox.nix (100%) rename network.nix => network/network.nix (100%) diff --git a/README.md b/README.md index 8a5e6d8..0f4a3c5 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ The data directories of the services can be found in `/var/lib` on the deployed Installation --- -The easiest way is to run `nix-shell` (on a Linux machine) in the nix-bitcoin directory and then create a [NixOps](https://nixos.org/nixops/manual/) deployment with the provided network.nix. +The easiest way is to run `nix-shell` (on a Linux machine) in the nix-bitcoin directory and then create a [NixOps](https://nixos.org/nixops/manual/) deployment with the provided `network.nix` in the `network` directory. Fix the FIXMEs in configuration.nix and deploy with nixops in nix-shell. See [install.md](docs/install.md) for a detailed tutorial. diff --git a/docs/install.md b/docs/install.md index 48b4239..c698348 100644 --- a/docs/install.md +++ b/docs/install.md @@ -92,7 +92,7 @@ The following steps are meant to be run on the machine you deploy from, not the 3. Create nixops deployment in nix-shell. ``` - nixops create network.nix network-vbox.nix -d bitcoin-node + nixops create network/network.nix network/network-vbox.nix -d bitcoin-node ``` 4. Adjust configuration by opening `configuration.nix` and removing FIXMEs. Enable/disable the modules you want in `configuration.nix`. @@ -280,7 +280,7 @@ On the machine you are deploying from: 4. Create network file ``` - nano network-nixos.nix + nano network/network-nixos.nix ``` ``` @@ -327,7 +327,7 @@ On the machine you are deploying from: 9. Create nixops deployment in nix-shell. ``` - nixops create network.nix network-nixos.nix -d bitcoin-node + nixops create network/network.nix network/network-nixos.nix -d bitcoin-node ``` 10. Adjust configuration by opening `configuration.nix` and removing FIXMEs. Enable/disable the modules you want in `configuration.nix`. diff --git a/network-libvirtd.nix b/network/network-libvirtd.nix similarity index 100% rename from network-libvirtd.nix rename to network/network-libvirtd.nix diff --git a/network-vbox.nix b/network/network-vbox.nix similarity index 100% rename from network-vbox.nix rename to network/network-vbox.nix diff --git a/network.nix b/network/network.nix similarity index 100% rename from network.nix rename to network/network.nix