gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: system -> systemConfig

Browse source
This commit is contained in:
arcnmx 2024-06-23 10:06:36 -07:00
parent 512b1fc75b
commit 45705650bb
31 changed files with 127 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/nixos/monitoring/ingest/grafana.nix
View file

@ -1,12 +1,12 @@
{
config,
system,
systemConfig,
lib,
...
}: let
inherit (lib.modules) mkDefault;
cfg = config.services.grafana;
service = system.exports.services.grafana;
service = systemConfig.exports.services.grafana;
in {
services.grafana = {
settings.server = {

4
modules/nixos/monitoring/ingest/loki.nix
View file

@ -11,8 +11,8 @@
promtailSystems =
filterAttrs (
_: system:
system.config.access.online.enable
&& system.config.exports.services.promtail.enable
system.access.online.enable
&& system.exports.services.promtail.enable
)
systems;
cfg = config.services.loki;

12
modules/nixos/monitoring/ingest/prometheus.nix
View file

@ -12,8 +12,8 @@
nodeExporterSystems =
filter (
system:
system.config.exports.prometheus.exporter.enable
&& system.config.exports.prometheus.exporter.services != []
system.exports.prometheus.exporter.enable
&& system.exports.prometheus.exporter.services != []
)
(attrValues systems);
mkPortTarget = {
@ -22,17 +22,17 @@
portName,
}: let
port = service.ports.${portName};
in "${mkAddress6 (access.getAddressFor system.config.name "lan")}:${toString port.port}";
in "${mkAddress6 (access.getAddressFor system.name "lan")}:${toString port.port}";
mkServiceConfig = system: serviceName: let
inherit (service.prometheus) exporter;
service = system.config.exports.services.${serviceName};
service = system.exports.services.${serviceName};
targets = map (portName:
mkPortTarget {
inherit system service portName;
})
exporter.ports;
in {
job_name = "${system.config.name}-${service.id}";
job_name = "${system.name}-${service.id}";
static_configs = [
{
inherit targets;
@ -49,7 +49,7 @@
insecure_skip_verify = mkDefault true;
};
};
mapSystem = system: map (mkServiceConfig system) system.config.exports.prometheus.exporter.services;
mapSystem = system: map (mkServiceConfig system) system.exports.prometheus.exporter.services;
in {
services.prometheus = {
port = mkDefault 9090;

6
modules/nixos/monitoring/source/promtail.nix
View file

@ -1,6 +1,6 @@
{
config,
system,
systemConfig,
access,
lib,
...
@ -23,12 +23,12 @@ in {
];
scrape_configs = [
{
job_name = "${system.name}-journald";
job_name = "${systemConfig.name}-journald";
journal = {
max_age = "${toString (24 * 7)}h";
labels = {
job = "systemd-journald";
system = system.name;
system = systemConfig.name;
host = config.networking.fqdn;
};
};

4
modules/nixos/nginx/proxied.nix
View file

@ -158,7 +158,7 @@ let
in
{
config,
system,
systemConfig,
gensokyo-zone,
lib,
...
@ -196,7 +196,7 @@ in
nginx'proxied = mkIf (warnEnable cfg.enable) {
servers.local = {
accessService = {
system = system.name;
system = systemConfig.name;
name = "nginx";
port = "proxied";
};

4
modules/nixos/nginx/vouch.nix
View file

@ -1,6 +1,6 @@
{
config,
system,
systemConfig,
lib,
gensokyo-zone,
...
@ -348,7 +348,7 @@ in {
ssl.enable = mkAlmostOptionDefault true;
};
int = {upstream, ...}: {
enable = mkAlmostOptionDefault system.network.networks.int.enable or false;
enable = mkAlmostOptionDefault systemConfig.network.networks.int.enable or false;
addr = mkAlmostOptionDefault "login.int.${networking.domain}";
port = mkOptionDefault 9080;
};