Compare commits

..

No commits in common. "2e20dabf069b03da88b1474e90959d12a905b485" and "60dce8e6810327136ec61770f1452a059014917e" have entirely different histories.

3 changed files with 11 additions and 26 deletions

View file

@ -1,7 +1,6 @@
{ {
config, config,
lib, lib,
pkgs,
... ...
}: }:
let let
@ -16,7 +15,6 @@ in
"sisko" "sisko"
"picard" "picard"
"kirk" "kirk"
"pike"
] ]
{ {
enable = true; enable = true;
@ -55,7 +53,6 @@ in
"sisko" "sisko"
"picard" "picard"
"kirk" "kirk"
"pike"
] ]
{ {
enable = true; enable = true;
@ -65,17 +62,13 @@ in
[ [
"picard" "picard"
"kirk" "kirk"
"pike"
] ]
{ {
enable = true; enable = true;
}; };
restic = mkFor [ "sisko" ] { # restic = mkFor ["sisko"] {
# https://github.com/ngosang/restic-exporter/issues/31 # enable = true;
enable = false; # };
repository = config.services.restic.backups.sisko.repository;
passwordFile = config.age.secrets.SISKO_RESTIC_PASSWORD.path;
};
postgres = mkFor [ "sisko" ] { postgres = mkFor [ "sisko" ] {
enable = true; enable = true;
}; };
@ -88,12 +81,9 @@ in
"sisko" "sisko"
"picard" "picard"
"kirk" "kirk"
"pike"
] ]
{ {
enable = true; enable = true;
}; };
}; };
systemd.services.prometheus-restic-exporter.path = [ pkgs.openssh ];
} }

View file

@ -27,14 +27,14 @@ in
} }
]; ];
} }
# { {
# job_name = "pushgateway"; job_name = "pushgateway";
# static_configs = [ static_configs = [
# { {
# targets = [ cfg.pushgateway.web.listen-address ]; targets = [ cfg.pushgateway.web.listen-address ];
# } }
# ]; ];
# } }
{ {
job_name = "node"; job_name = "node";
static_configs = [ static_configs = [
@ -43,7 +43,6 @@ in
"sisko" "sisko"
"picard" "picard"
"kirk" "kirk"
"pike"
]; ];
} }
]; ];
@ -55,7 +54,6 @@ in
targets = builtins.map (host: "${host}.wg.aciceri.dev:9586") [ targets = builtins.map (host: "${host}.wg.aciceri.dev:9586") [
"picard" "picard"
"kirk" "kirk"
"pike"
]; ];
} }
]; ];
@ -67,7 +65,6 @@ in
targets = builtins.map (host: "${host}.wg.aciceri.dev:9134") [ targets = builtins.map (host: "${host}.wg.aciceri.dev:9134") [
"picard" "picard"
"kirk" "kirk"
"pike"
]; ];
} }
]; ];
@ -104,14 +101,12 @@ in
"sisko" "sisko"
"kirk" "kirk"
"picard" "picard"
"pike"
]; ];
} }
]; ];
} }
]; ];
}; };
environment.persistence."/persist".directories = [ environment.persistence."/persist".directories = [
"/var/lib/${cfg.stateDir}" "/var/lib/${cfg.stateDir}"
]; ];

Binary file not shown.