modules: services: use new nginx wrapper
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
And when not possible, document why. Note for the future: there is some repetition in some modules to configure the correct value of the subdomain, which I happen to know will line up correctly thanks to the nginx wrapper. A good way to refactor this in the future would involve avoiding this repetition, allowing use to query the correct domain in some way...
This commit is contained in:
parent
81e12969eb
commit
7032ddef37
19 changed files with 187 additions and 254 deletions
|
|
@ -2,9 +2,6 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.my.services.monitoring;
|
||||
|
||||
domain = config.networking.domain;
|
||||
grafanaDomain = "monitoring.${config.networking.domain}";
|
||||
in
|
||||
{
|
||||
options.my.services.monitoring = with lib; {
|
||||
|
|
@ -52,7 +49,7 @@ in
|
|||
config = lib.mkIf cfg.enable {
|
||||
services.grafana = {
|
||||
enable = true;
|
||||
domain = grafanaDomain;
|
||||
domain = "monitoring.${config.networking.domain}";
|
||||
port = cfg.grafana.port;
|
||||
addr = "127.0.0.1"; # Proxied through Nginx
|
||||
|
||||
|
|
@ -115,16 +112,11 @@ in
|
|||
];
|
||||
};
|
||||
|
||||
services.nginx = {
|
||||
virtualHosts.${grafanaDomain} = {
|
||||
forceSSL = true;
|
||||
useACMEHost = domain;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:${toString cfg.grafana.port}";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
my.services.nginx.virtualHosts = [
|
||||
{
|
||||
subdomain = "monitoring";
|
||||
inherit (cfg.grafana) port;
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue