use unevaluatedNixosConfigurations instead

This commit is contained in:
Markus Schmidl 2023-11-26 02:51:36 +01:00
parent bd1e6d73c9
commit d413aeb5c0
5 changed files with 6 additions and 5 deletions

View File

@ -81,7 +81,7 @@ in
loki = { loki = {
enable = true; enable = true;
configuration = { configuration = {
server.http_listen_port = 3100; server.http_listen_port = registry.port-loki;
auth_enabled = false; auth_enabled = false;
ingester = { ingester = {

View File

@ -14,7 +14,7 @@
port = 5432; port = 5432;
authentication = authentication =
let let
senpai-ip = self.nixosConfigurations.notice-me-senpai._module.specialArgs.registry.wgAddr4; senpai-ip = self.unevaluatedNixosConfigurations.notice-me-senpai.specialArgs.registry.wgAddr4;
# TODO: fixme # TODO: fixme
uranus-ip = "10.13.37.9"; uranus-ip = "10.13.37.9";
in in

View File

@ -1,7 +1,7 @@
{ lib, config, self, registry, ... }: { lib, config, self, registry, ... }:
let let
cfg = config.deployment-TLMS.monitoring; cfg = config.deployment-TLMS.monitoring;
monitoring-host = self.nixosConfigurations.notice-me-senpai; monitoring-host-registry = self.unevaluatedNixosConfigurations.notice-me-senpai.specialArgs.registry;
in in
{ {
options.deployment-TLMS.monitoring = with lib; { options.deployment-TLMS.monitoring = with lib; {
@ -59,7 +59,7 @@ in
filename = "/tmp/positions.yaml"; filename = "/tmp/positions.yaml";
}; };
clients = [{ clients = [{
url = "http://${monitoring-host._module.specialArgs.registry.wgAddr4}:${toString monitoring-host.config.services.loki.configuration.server.http_listen_port}/loki/api/v1/push"; url = "http://${monitoring-host-registry.wgAddr4}:${toString monitoring-host-registry.port-loki}/loki/api/v1/push";
}]; }];
scrape_configs = [{ scrape_configs = [{
job_name = "journal"; job_name = "journal";

View File

@ -6,7 +6,7 @@
enableTCPIP = true; enableTCPIP = true;
authentication = let authentication = let
senpai-ip = senpai-ip =
self.nixosConfigurations.notice-me-senpai._module.specialArgs.registry.wgAddr4; self.unevaluatedNixosConfigurations.notice-me-senpai.specialArgs.registry.wgAddr4;
in pkgs.lib.mkOverride 10 '' in pkgs.lib.mkOverride 10 ''
local all all trust local all all trust
host all all 127.0.0.1/32 trust host all all 127.0.0.1/32 trust

View File

@ -20,6 +20,7 @@
wgAddr4 = "10.13.37.200"; wgAddr4 = "10.13.37.200";
wireguardPublicKey = "z2E9TjL9nn0uuLmyQexqddE6g8peB5ENyf0LxpMolD4="; wireguardPublicKey = "z2E9TjL9nn0uuLmyQexqddE6g8peB5ENyf0LxpMolD4=";
publicWireguardEndpoint = null; publicWireguardEndpoint = null;
port-loki = 3100;
}; };
uranus = { uranus = {
hostName = "uranus"; hostName = "uranus";