From 0ec4127225a4c9b3ac44b05a2a5a80c132d6c296 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 3 Dec 2019 17:03:48 +0100
Subject: [PATCH] Use options.c3d2 at hydra, pulsebert, storage-ng

---
 host-registry.nix                        | 3 ++-
 hosts/hydra/configuration.nix            | 7 +++++++
 hosts/pulsebert/configuration.nix        | 7 +++++++
 hosts/server7/containers/tox/default.nix | 4 ++--
 hosts/storage-ng/configuration.nix       | 7 +++++++
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/host-registry.nix b/host-registry.nix
index 4bd1b092..88d77eed 100644
--- a/host-registry.nix
+++ b/host-registry.nix
@@ -1,6 +1,7 @@
 # Registry of C3D2 machines.
 
-let hosts = [ "adc" "grafana" "server7" "tox" ];
+let
+  hosts = [ "adc" "grafana" "hydra" "server7" "storage-ng" "pulsebert" "tox" ];
 in {
   hqPublic = hosts;
   hqPrivate = hosts;
diff --git a/hosts/hydra/configuration.nix b/hosts/hydra/configuration.nix
index 700994ff..4cb691c0 100644
--- a/hosts/hydra/configuration.nix
+++ b/hosts/hydra/configuration.nix
@@ -5,6 +5,7 @@
     <nixpkgs/nixos/modules/profiles/minimal.nix>
     ./hydra.nix
     ./cache.nix
+    ../../lib
     ../../lib/hq.nix
     ../../lib/known-hosts.nix
     ../../lib/emery.nix
@@ -13,6 +14,12 @@
     ../../lib/tun.nix
   ];
 
+  c3d2 = {
+    isInHq = true;
+    mapHqHosts = true;
+    hq.interface = "eth0";
+  };
+
   networking.interfaces.eth0.preferTempAddress = false;
   services.yggdrasil = {
     configFile = "/var/lib/yggdrasil/keys";
diff --git a/hosts/pulsebert/configuration.nix b/hosts/pulsebert/configuration.nix
index c257794a..864dc4aa 100644
--- a/hosts/pulsebert/configuration.nix
+++ b/hosts/pulsebert/configuration.nix
@@ -11,6 +11,7 @@ in {
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../lib
       ../../lib/admins.nix
       ../../lib/hq.nix
       ../../lib/users.nix
@@ -19,6 +20,12 @@ in {
       ../../lib/hail.nix
     ];
 
+  c3d2 = {
+    isInHq = true;
+    mapHqHosts = true;
+    hq.interface = "eno1";
+  };
+
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/hosts/server7/containers/tox/default.nix b/hosts/server7/containers/tox/default.nix
index 5b8dc842..f4556f31 100644
--- a/hosts/server7/containers/tox/default.nix
+++ b/hosts/server7/containers/tox/default.nix
@@ -40,8 +40,8 @@
   };
 
   services.collectd.extraConfig = ''
-    LoadPlugin load
-    LoadPlugin interface
+    <Plugin "interface"/>
+    <Plugin "load"/>
   '';
 
 }
diff --git a/hosts/storage-ng/configuration.nix b/hosts/storage-ng/configuration.nix
index 47e9cd5e..450606e2 100644
--- a/hosts/storage-ng/configuration.nix
+++ b/hosts/storage-ng/configuration.nix
@@ -8,6 +8,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../lib
       ../../lib/hq.nix
       ../../lib/shared.nix
       ../../lib/users.nix
@@ -16,6 +17,12 @@
       ../../lib/default-gateway.nix
     ];
 
+  c3d2 = {
+    isInHq = true;
+    mapHqHosts = true;
+    hq.interface = "eth0";
+  };
+
   boot.loader.systemd-boot.enable = true;
   systemd = {
     enableEmergencyMode = false;