diff --git a/morph/lib/issuer.nix b/morph/lib/issuer.nix index 1f715171625d75175d9c962160e4773d9c6765d2..c813eb5845a1467d98a473d8e60299fb7383c567 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 709fbce5617b3c6fcc0d1ee2f79b82b7730e4251..e7b87201fd04dfe429e97fa89f13f37ef760042b 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 eba7f5f5841df3aedd3157707d8005142f778410..0ea5541abe690739069d760b25a560b9d12ff7c0 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 c7dde9aa5e285aac58283d2ac2a44b0dec9bc566..09796ef543026ce947dd18c600f98617b9eb3f5d 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 ]; }