From 27ef4eb16f3aaa6de8d5616d715061d4836dd67e Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Sun, 27 Feb 2022 06:51:47 +0000
Subject: [PATCH] Cleanups, ordering, cleaner diff
---
morph/lib/issuer.nix | 2 ++
morph/lib/monitored-node.nix | 1 -
morph/lib/storage.nix | 1 +
nixos/modules/default.nix | 8 ++++----
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/morph/lib/issuer.nix b/morph/lib/issuer.nix
index 1f715171..c813eb58 100644
--- a/morph/lib/issuer.nix
+++ b/morph/lib/issuer.nix
@@ -60,6 +60,8 @@ in {
domains = issuerDomains;
};
+ services.private-storage.monitoring.exporters.node.enable = true;
+
system.stateVersion = "19.03";
};
}
diff --git a/morph/lib/monitored-node.nix b/morph/lib/monitored-node.nix
index 709fbce5..e7b87201 100644
--- a/morph/lib/monitored-node.nix
+++ b/morph/lib/monitored-node.nix
@@ -24,7 +24,6 @@ in {
};
};
- services.private-storage.monitoring.exporters.node.enable = true;
services.private-storage.monitoring.vpn.client = {
enable = true;
ip = monitoringvpnIPv4;
diff --git a/morph/lib/storage.nix b/morph/lib/storage.nix
index eba7f5f5..0ea5541a 100644
--- a/morph/lib/storage.nix
+++ b/morph/lib/storage.nix
@@ -44,6 +44,7 @@ in {
};
};
+ services.private-storage.monitoring.exporters.node.enable = true;
services.private-storage.monitoring.exporters.tahoe.enable = true;
# Turn on the Private Storage (Tahoe-LAFS) service.
diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix
index c7dde9aa..09796ef5 100644
--- a/nixos/modules/default.nix
+++ b/nixos/modules/default.nix
@@ -10,12 +10,12 @@
# configuration. If PaymentServer hasn't been enabled then the
# configuration will just be ignored.
imports = [
+ ./packages.nix
./issuer.nix
+ ./private-storage.nix
+ ./monitoring/vpn/client.nix
./monitoring/exporters/node.nix
- ./monitoring/exporters/promtail.nix
./monitoring/exporters/tahoe.nix
- ./monitoring/vpn/client.nix
- ./packages.nix
- ./private-storage.nix
+ ./monitoring/exporters/promtail.nix
];
}
--
GitLab