diff options
author | Jesper <yesbox@users.noreply.github.com> | 2018-08-05 00:05:48 +0200 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-05 00:05:48 +0200 |
commit | 0254ae4e80f9bf659430d2ec3e452ccb049ce2fb (patch) | |
tree | f64eb13166cbf6e635167391e3a2ff57b40fab7f /nixos/modules | |
parent | 606a260f3be16a76472b09d60716bd90b1e76258 (diff) | |
download | nixlib-0254ae4e80f9bf659430d2ec3e452ccb049ce2fb.tar nixlib-0254ae4e80f9bf659430d2ec3e452ccb049ce2fb.tar.gz nixlib-0254ae4e80f9bf659430d2ec3e452ccb049ce2fb.tar.bz2 nixlib-0254ae4e80f9bf659430d2ec3e452ccb049ce2fb.tar.lz nixlib-0254ae4e80f9bf659430d2ec3e452ccb049ce2fb.tar.xz nixlib-0254ae4e80f9bf659430d2ec3e452ccb049ce2fb.tar.zst nixlib-0254ae4e80f9bf659430d2ec3e452ccb049ce2fb.zip |
netdata: 1.9.0 -> 1.10.0 (#44472)
The web_access.patch would no longer apply. It disabled a check that required the static files for the web UI to be owned by the user the daemon runs as (not root, so it doesn't work well with nix). Besides updating netdata, this commit removes that patch, changes the netdata service config to set the "web files owner/group" option to "root" and adds a test that checks that the web UI is being served. This allows the web files to be owned by root without patching.
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/monitoring/netdata.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index eefddf5a206b..edcaa10d969d 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -14,6 +14,10 @@ let global = { "plugins directory" = "${wrappedPlugins}/libexec/netdata/plugins.d ${pkgs.netdata}/libexec/netdata/plugins.d"; }; + web = { + "web files owner" = "root"; + "web files group" = "root"; + }; }; mkConfig = generators.toINI {} (recursiveUpdate localConfig cfg.config); configFile = pkgs.writeText "netdata.conf" (if cfg.configText != null then cfg.configText else mkConfig); |