c3d2/nix-config
c3d2/nix-config
23
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

stats: fix eval, fix default nginx status port

Browse Source
This commit is contained in:
Sandro - 2023-04-11 01:20:55 +02:00
parent e450e6cdf1
commit 8860310068
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
modules/stats.nix
View File

@ -55,16 +55,16 @@ in
}; };
}; };
services.nginx = lib.mkIf config.services.nginx.enable { nginx = lib.mkIf config.services.nginx.enable {
virtualHosts.localhost = { virtualHosts.localhost = {
listen = [ listen = [
{ {
addr = "127.0.0.1"; addr = "127.0.0.1";
port = 9101; port = 9102;
} }
{ {
addr = "[::1]"; addr = "[::1]";
port = 9101; port = 9102;
} }
]; ];
locations."/nginx_status".extraConfig = '' locations."/nginx_status".extraConfig = ''
@ -79,47 +79,45 @@ in
}; };
} }
{ (lib.mkIf (pkgs.system != "riscv64-linux") {
services = lib.mkIf (pkgs.system != "riscv64-linux") { nginx = {
nginx = { enable = true;
enable = true; virtualHosts."_" = {
virtualHosts."_" = { listen =
listen = let
let port = 9100;
port = 9100; in
in [
[ { addr = "0.0.0.0"; inherit port; }
{ addr = "0.0.0.0"; inherit port; } { addr = "[::]"; inherit port; }
{ addr = "[::]"; inherit port; } ];
]; locations."/metrics" = {
locations."/metrics" = { proxyPass = "http://127.0.0.1:${toString config.services.prometheus.exporters.node.port}/metrics";
proxyPass = "http://127.0.0.1:${toString config.services.prometheus.exporters.node.port}/metrics"; # ip ranges duplicated with matemat
# ip ranges duplicated with matemat extraConfig = ''
extraConfig = '' satisfy any;
satisfy any; allow 2a00:8180:2c00:200::/56;
allow 2a00:8180:2c00:200::/56; allow 2a0f:5382:acab:1400::/56;
allow 2a0f:5382:acab:1400::/56; allow fd23:42:c3d2:500::/56;
allow fd23:42:c3d2:500::/56; allow 30c:c3d2:b946:76d0::/64;
allow 30c:c3d2:b946:76d0::/64; allow ::1/128;
allow ::1/128; allow 172.22.99.0/24;
allow 172.22.99.0/24; allow 172.20.72.0/21;
allow 172.20.72.0/21; allow 127.0.0.0/8;
allow 127.0.0.0/8; deny all;
deny all; '';
'';
};
}; };
}; };
prometheus.exporters.node = {
enable = true;
enabledCollectors = [ "ethtool" "systemd" ];
listenAddress = "127.0.0.1";
openFirewall = true;
port = 9101;
};
}; };
}
prometheus.exporters.node = {
enable = true;
enabledCollectors = [ "ethtool" "systemd" ];
listenAddress = "127.0.0.1";
openFirewall = true;
port = 9101;
};
})
]; ];
}; };
} }