Skip to content
Snippets Groups Projects
Commit 27ef4eb1 authored by Florian Sesser's avatar Florian Sesser
Browse files

Cleanups, ordering, cleaner diff

parent 1d6acf63
Branches
No related tags found
2 merge requests!278merge develop into production,!271Factoring improvements (VPN client, monitoring exporters)
...@@ -60,6 +60,8 @@ in { ...@@ -60,6 +60,8 @@ in {
domains = issuerDomains; domains = issuerDomains;
}; };
services.private-storage.monitoring.exporters.node.enable = true;
system.stateVersion = "19.03"; system.stateVersion = "19.03";
}; };
} }
...@@ -24,7 +24,6 @@ in { ...@@ -24,7 +24,6 @@ in {
}; };
}; };
services.private-storage.monitoring.exporters.node.enable = true;
services.private-storage.monitoring.vpn.client = { services.private-storage.monitoring.vpn.client = {
enable = true; enable = true;
ip = monitoringvpnIPv4; ip = monitoringvpnIPv4;
......
...@@ -44,6 +44,7 @@ in { ...@@ -44,6 +44,7 @@ in {
}; };
}; };
services.private-storage.monitoring.exporters.node.enable = true;
services.private-storage.monitoring.exporters.tahoe.enable = true; services.private-storage.monitoring.exporters.tahoe.enable = true;
# Turn on the Private Storage (Tahoe-LAFS) service. # Turn on the Private Storage (Tahoe-LAFS) service.
......
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
# configuration. If PaymentServer hasn't been enabled then the # configuration. If PaymentServer hasn't been enabled then the
# configuration will just be ignored. # configuration will just be ignored.
imports = [ imports = [
./packages.nix
./issuer.nix ./issuer.nix
./private-storage.nix
./monitoring/vpn/client.nix
./monitoring/exporters/node.nix ./monitoring/exporters/node.nix
./monitoring/exporters/promtail.nix
./monitoring/exporters/tahoe.nix ./monitoring/exporters/tahoe.nix
./monitoring/vpn/client.nix ./monitoring/exporters/promtail.nix
./packages.nix
./private-storage.nix
]; ];
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment