nixos/netdata: fix module when withSystemdJournal = false (#426653)
This commit is contained in:
@@ -447,14 +447,6 @@ in
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
|
||||
"systemd-journal.plugin" = {
|
||||
source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org";
|
||||
capabilities = "cap_dac_read_search,cap_syslog+ep";
|
||||
owner = cfg.user;
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
|
||||
"slabinfo.plugin" = {
|
||||
source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org";
|
||||
capabilities = "cap_dac_override+ep";
|
||||
@@ -490,6 +482,15 @@ in
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs (cfg.package.withSystemdJournal) {
|
||||
"systemd-journal.plugin" = {
|
||||
source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org";
|
||||
capabilities = "cap_dac_read_search,cap_syslog+ep";
|
||||
owner = cfg.user;
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
};
|
||||
|
||||
security.pam.loginLimits = [
|
||||
|
||||
@@ -276,7 +276,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl3Only;
|
||||
};
|
||||
}).goModules;
|
||||
inherit withIpmi withNetworkViewer withNdsudo;
|
||||
inherit
|
||||
withIpmi
|
||||
withNdsudo
|
||||
withNetworkViewer
|
||||
withSystemdJournal
|
||||
;
|
||||
tests.netdata = nixosTests.netdata;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user