From 9ea4ce0ce3b8d5c582e8fce581f5b077a79fdd43 Mon Sep 17 00:00:00 2001
From: victor <victor@xirion.net>
Date: Thu, 29 Sep 2022 10:31:51 +0200
Subject: [PATCH] prep vault-0.hades

---
 nixos/hosts/hades/default.nix                 |  5 ++
 nixos/hosts/hades/vault-0/configuration.nix   | 49 +++++++++++++++++++
 nixos/hosts/olympus/vault-0/configuration.nix |  4 ++
 nixos/hosts/thalassa/null/home/default.nix    |  7 +--
 nixos/pkgs/default.nix                        |  1 -
 .../default.nix                               | 28 -----------
 6 files changed, 59 insertions(+), 35 deletions(-)
 create mode 100644 nixos/hosts/hades/vault-0/configuration.nix
 delete mode 100644 nixos/pkgs/dnd-5e-latex-character-sheet-template/default.nix

diff --git a/nixos/hosts/hades/default.nix b/nixos/hosts/hades/default.nix
index 0c65eff..a750235 100644
--- a/nixos/hosts/hades/default.nix
+++ b/nixos/hosts/hades/default.nix
@@ -29,6 +29,11 @@
     mac = "00:0c:29:a1:4e:28";
     nix = false;
   }
+  {
+    hostname = "vault-0";
+    ip = "192.168.0.103";
+    mac = "7A:14:15:ED:D1:E6";
+  }
   {
     hostname = "MariaDB";
     ip = "192.168.0.109";
diff --git a/nixos/hosts/hades/vault-0/configuration.nix b/nixos/hosts/hades/vault-0/configuration.nix
new file mode 100644
index 0000000..f338fa5
--- /dev/null
+++ b/nixos/hosts/hades/vault-0/configuration.nix
@@ -0,0 +1,49 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, hosts, ... }:
+let 
+  port = 8200;
+  clusterPort = 8201;
+in {
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "21.05"; # Did you read the comment?
+
+  # Additional packages
+  environment.systemPackages = with pkgs; [ ];
+
+  # Vault
+  networking.firewall.allowedTCPPorts = [ port clusterPort ];
+
+  services.vault = {
+    enable = true;
+    # bin version includes the UI
+    package = pkgs.vault-bin;
+    address = "0.0.0.0:${toString port}";
+    storageBackend = "raft";
+    storagePath = "/var/lib/vault-raft";
+    storageConfig = ''
+      node_id = "hades-1"
+
+      retry_join {
+        leader_api_addr = "http://10.42.42.30:${toString port}"
+      }
+
+      retry_join {
+        leader_api_addr = "http://10.42.42.6:${toString port}"
+      }
+    '';
+    extraConfig = ''
+      ui = true
+      disable_mlock = true
+      api_addr = "http://192.168.0.103:${toString port}"
+      cluster_addr = "http://192.168.0.103:${toString clusterPort}"
+    '';
+  };
+}
diff --git a/nixos/hosts/olympus/vault-0/configuration.nix b/nixos/hosts/olympus/vault-0/configuration.nix
index 6121864..612f519 100644
--- a/nixos/hosts/olympus/vault-0/configuration.nix
+++ b/nixos/hosts/olympus/vault-0/configuration.nix
@@ -30,6 +30,10 @@ in {
     storagePath = "/var/lib/vault-raft";
     storageConfig = ''
       node_id = "olympus-1"
+
+      retry_join {
+        leader_api_addr = "http://10.42.42.30:${toString port}"
+      }
     '';
     extraConfig = ''
       ui = true
diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix
index 9c97d49..a0397c0 100644
--- a/nixos/hosts/thalassa/null/home/default.nix
+++ b/nixos/hosts/thalassa/null/home/default.nix
@@ -2,12 +2,7 @@
 let
   tex = (pkgs.texlive.combine {
     inherit (pkgs.texlive) scheme-full;
-    dnd-5e-latex-template = {
-      pkgs = [
-        pkgs.v.dnd-5e-latex-template
-        pkgs.v.dnd-5e-latex-character-sheet-template
-      ];
-    };
+    dnd-5e-latex-template = { pkgs = [ pkgs.v.dnd-5e-latex-template ]; };
   });
 in {
   programs.home-manager.enable = true;
diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix
index fc3a172..acc9d28 100644
--- a/nixos/pkgs/default.nix
+++ b/nixos/pkgs/default.nix
@@ -14,7 +14,6 @@ final: prev: {
     };
 
     dnd-5e-latex-template = prev.callPackage ./dnd-5e-latex-template { };
-    dnd-5e-latex-character-sheet-template = prev.callPackage ./dnd-5e-latex-character-sheet-template { };
 
     gitea-agatheme = prev.callPackage ./gitea-agatheme { };
   };
diff --git a/nixos/pkgs/dnd-5e-latex-character-sheet-template/default.nix b/nixos/pkgs/dnd-5e-latex-character-sheet-template/default.nix
deleted file mode 100644
index 6b82487..0000000
--- a/nixos/pkgs/dnd-5e-latex-character-sheet-template/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, stdenvNoCC, fetchFromGitHub }: stdenvNoCC.mkDerivation rec {
-  pname = "dnd-5e-latex-character-sheet-template";
-  version = "0.1.0";
-  tlType = "run";
-
-  src = fetchFromGitHub {
-    owner = "matsavage";
-    repo = "DND-5e-LaTeX-Character-Sheet-Template";
-    rev = "d9ab382c7c9da4680a99355cb99510a318f159e3";
-    sha256 = lib.fakeSha256;
-  };
-
-  phases = [ "installPhase" ];
-
-  installPhase = ''
-      runHook preInstall
-
-      path="$out/tex/latex/${pname}"
-      mkdir -p "$path"
-      cp -r $src/* $path
-
-      runHook postInstall
-  '';
-
-  meta = {
-    description = "DnD 5e latex character template";
-  };
-}