cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #98259 from NixOS/revert-87553-enhancing-monit-module

Browse source 
Revert "nixos/monit: Allow splitting the config in multiple files"
This commit is contained in:
Ryan Mulligan 2020-09-18 22:00:22 -07:00 committed by GitHub
commit 4418b3796e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
nixos/modules/services/monitoring/monit.nix
View file

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