diff --git a/config/hosts/metrics-nekomesh/anubis.nix b/config/hosts/metrics-nekomesh/anubis.nix new file mode 100644 index 0000000..52dd7fb --- /dev/null +++ b/config/hosts/metrics-nekomesh/anubis.nix @@ -0,0 +1,12 @@ +{ config, ... }: +{ + services.anubis = { + instances."nekomesh" = { + enable = true; + settings = { + TARGET = "http://${config.services.grafana.settings.server.http_addr}:${builtins.toString config.services.grafana.settings.server.http_port}"; + SERVE_ROBOTS_TXT = true; + }; + }; + }; +} diff --git a/config/hosts/metrics-nekomesh/default.nix b/config/hosts/metrics-nekomesh/default.nix index ef5c25c..2052624 100644 --- a/config/hosts/metrics-nekomesh/default.nix +++ b/config/hosts/metrics-nekomesh/default.nix @@ -1,6 +1,7 @@ { ... }: { imports = [ + ./anubis.nix ./configuration.nix ./grafana.nix ./prometheus.nix diff --git a/config/hosts/metrics-nekomesh/grafana.nix b/config/hosts/metrics-nekomesh/grafana.nix index 69e5a6d..5443fce 100644 --- a/config/hosts/metrics-nekomesh/grafana.nix +++ b/config/hosts/metrics-nekomesh/grafana.nix @@ -4,7 +4,7 @@ enable = true; settings = { server = { - domain = "nekomesh.nekover.se"; + domain = "mesh.nekover.se"; root_url = "https://${config.services.grafana.settings.server.domain}"; }; security = { diff --git a/config/hosts/metrics-nekomesh/nginx.nix b/config/hosts/metrics-nekomesh/nginx.nix index 9e31454..885fc05 100644 --- a/config/hosts/metrics-nekomesh/nginx.nix +++ b/config/hosts/metrics-nekomesh/nginx.nix @@ -18,7 +18,7 @@ } ]; locations."/" = { - proxyPass = "http://${config.services.grafana.settings.server.http_addr}:${builtins.toString config.services.grafana.settings.server.http_port}"; + proxyPass = "http://unix:/run/anubis/anubis-nekomesh.sock"; proxyWebsockets = true; }; }; diff --git a/config/hosts/web-public-2/nginx.nix b/config/hosts/web-public-2/nginx.nix index 5c790f7..608d6a7 100644 --- a/config/hosts/web-public-2/nginx.nix +++ b/config/hosts/web-public-2/nginx.nix @@ -30,7 +30,7 @@ matrix-rtc.nekover.se 10.202.41.112:8443; mewtube.nekover.se 127.0.0.1:8443; nekover.se 127.0.0.1:8443; - nekomesh.nekover.se 10.202.41.126:8443; + mesh.nekover.se 10.202.41.126:8443; nix-cache.nekover.se 10.202.41.121:8443; searx.nekover.se 10.202.41.105:8443; social.nekover.se 10.202.41.104:8443; diff --git a/config/hosts/web-public-2/virtualHosts/acme-challenge.nix b/config/hosts/web-public-2/virtualHosts/acme-challenge.nix index 7e970f3..b3d0cc4 100644 --- a/config/hosts/web-public-2/virtualHosts/acme-challenge.nix +++ b/config/hosts/web-public-2/virtualHosts/acme-challenge.nix @@ -7,7 +7,7 @@ let "mas.nekover.se" = "matrix.vs.grzb.de"; "matrix.nekover.se" = "matrix.vs.grzb.de"; "matrix-rtc.nekover.se" = "matrix.vs.grzb.de"; - "nekomesh.nekover.se" = "metrics-nekomesh.vs.grzb.de"; + "mesh.nekover.se" = "metrics-nekomesh.vs.grzb.de"; "netbox.grzb.de" = "netbox.vs.grzb.de"; "git.nekover.se" = "forgejo.vs.grzb.de"; "grafana.grzb.de" = "metrics.vs.grzb.de";