public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #87553 from JoeDupuis/enhancing-monit-module

Browse Source 
nixos/monit: Allow splitting the config in multiple files
This commit is contained in:
Lassulus 2020-08-22 19:21:55 +02:00 committed by GitHub
commit 2fb9ee9caa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nixos/modules/services/monitoring/monit.nix
View File

@ -4,19 +4,29 @@ with lib;
let let
cfg = config.services.monit; cfg = config.services.monit;
extraConfig = pkgs.writeText "monitConfig" cfg.extraConfig;
in in
{ {
imports = [
(mkRenamedOptionModule [ "services" "monit" "config" ] ["services" "monit" "extraConfig" ])
];
options.services.monit = { options.services.monit = {
enable = mkEnableOption "Monit"; enable = mkEnableOption "Monit";
config = mkOption { configFiles = mkOption {
type = types.lines; type = types.listOf types.path;
default = ""; default = [];
description = "monitrc content"; description = "List of paths to be included in the monitrc file";
}; };
extraConfig = mkOption {
type = types.lines;
default = "";
description = "Additional monit config as string";
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -24,7 +34,7 @@ in
environment.systemPackages = [ pkgs.monit ]; environment.systemPackages = [ pkgs.monit ];
environment.etc.monitrc = { environment.etc.monitrc = {
text = cfg.config; text = concatMapStringsSep "\n" (path: "include ${path}") (cfg.configFiles ++ [extraConfig]);
mode = "0400"; mode = "0400";
}; };