From 78a45629dd0f4b50c9003eb0ff5e544ea9a39a40 Mon Sep 17 00:00:00 2001
From: Scott Wallace <scott@wallace.sh>
Date: Mon, 11 Apr 2022 09:38:23 +0100
Subject: [PATCH] Attempt to streamline the installation steps and README a
 little

---
 README.md                                     | 36 +++++++++----------
 docker-compose-lighthouse.yaml                | 20 -----------
 ...r-compose-node.yaml => docker-compose.yaml |  0
 3 files changed, 17 insertions(+), 39 deletions(-)
 delete mode 100644 docker-compose-lighthouse.yaml
 rename docker-compose-node.yaml => docker-compose.yaml (100%)

diff --git a/README.md b/README.md
index 073a19e..6d87bc3 100644
--- a/README.md
+++ b/README.md
@@ -46,24 +46,22 @@ Distributed & E2EE self-hosting.  The goal is to have nodes voluntarily join the
 
   The underlaying hardware type shouldn't be a constraint, within reason.
 
-## Lighthouse installation
-1. Clone the repo.
-2. Create a directory to hold the config and certificates.
-3. Copy `lighthouse-config.yaml` as `config.yaml` in the new directory.
-4. Update the `docker-compose-lighthouse.yaml` to bind mount the newly created directory to `/etc/nebula`; check and set a value for the `/storage` bind mount.
-5. Run the container with `docker-compose up -d`.  This will create two files, `host.key` and `host.csr`.
-6. Send the contents of the `host.csr` file to a cluster admin to sign.
-7. The returned, signed certificate should go alongside the `host.csr` file and be called, `host.crt`.
-8. Start the container again and it should find the config and certificates and then connect to the existing cluster.
-9. Update the `static_host_map` entry in the repo's `node-config.yaml` with the new Lighthouse mesh and public IP address and encourage node admins to update their nodes' config files from the repo.
-
-## Node installation
+## Installation
 
 1. Clone the repo.
-2. Create a directory to hold the config and certificates.
-3. Copy `node-config.yaml` as `config.yaml` in the new directory.
-4. Update the `docker-compose-node.yaml` to bind mount the newly created directory to `/etc/nebula`; check and set a value for the `/storage` bind mount.
-5. Run the container with `docker-compose up -d`.  This will create two files, `host.key` and `host.csr`.
-6. Send the contents of the `host.csr` file to a cluster admin to sign.
-7. The returned, signed certificate should go alongside the `host.csr` file and be called, `host.crt`.
-8. Start the container again and it should find the config and certificates and then connect to the existing cluster.
+2. Create two directories; one to hold the Nebula config and certificates and the other for the SeaweedFS config and certificates.
+3. Create `config.yaml` in the Nebula config directory.
+   1. Use `config-node.yaml` as the template for a normal cluster node.
+   2. Use `config-lighthouse.yaml` as the template for a Lighthouse.
+4. Update the `docker-compose.yaml` volume values for the bind mount directories for both the Nebula and SeaweedFS config directories; check and set a value for the `/storage` bind mount.
+   1. Set the `LIGHTHOUSE` environment variable to `true` for a Lighthouse.
+5. Decrypt and un-tar the contents of the `seaweed-conf.enc` file into the SeaweedFS config directory.
+    ```shell
+    openssl enc -aes-256-cbc -iter 30 -d -salt -in seaweed-conf.enc | (cd /path/to/infranet/config/seaweedfs && tar xvz)
+    ```
+    Ask a cluster admin or member for the password.
+6. Run the container with `docker-compose up -d`.  This will create two files in the Nebula config directory, `host.key` and `host.csr`.
+7. Send the contents of the `host.csr` file to a cluster admin to sign.
+8. The returned, signed certificate should go alongside the `host.csr` file and be called, `host.crt`.
+9.  Start the container again and it should find the config and certificates and then connect to the existing cluster.
+    1.  For a Lighthouse: create a pull request to update the `static_host_map` entry in the repo's `node-config.yaml` amended with the Lighthouse's Nebula mesh and public IP addresses and encourage node admins to update their nodes' config files from the repo.
diff --git a/docker-compose-lighthouse.yaml b/docker-compose-lighthouse.yaml
deleted file mode 100644
index 821ce85..0000000
--- a/docker-compose-lighthouse.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-version: "3"
-services:
-  infranet:
-    container_name: infranet
-    image: dcr.wallace.sh/scott/infranet:latest
-    volumes:
-      - /path/to/infranet/config/nebula:/etc/nebula
-      - /path/to/infranet/config/seaweedfs:/etc/seaweedfs
-      - /path/to/infranet/filestore:/storage
-    cap_add:
-      - NET_ADMIN
-    devices:
-      - /dev/net/tun
-    environment:
-      - TZ=UTC
-      - LIGHTHOUSE=true
-    ports:
-      - 4242:4242/udp
-    restart: unless-stopped
diff --git a/docker-compose-node.yaml b/docker-compose.yaml
similarity index 100%
rename from docker-compose-node.yaml
rename to docker-compose.yaml