mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-14 14:10:33 +03:00

After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build https://github.com/infinisil/treewide-nixpkgs-reformat-script/archive/a08b3a4d199c6124ac5b36a889d9099b4383463f.tar.gz \
--argstr baseRev 0128fbb0a5
result/bin/apply-formatting $NIXPKGS_PATH
281 lines
9 KiB
Nix
281 lines
9 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
...
|
|
}:
|
|
let
|
|
cfg = config.services.journalwatch;
|
|
user = "journalwatch";
|
|
# for journal access
|
|
group = "systemd-journal";
|
|
dataDir = "/var/lib/${user}";
|
|
|
|
journalwatchConfig = pkgs.writeText "config" (
|
|
''
|
|
# (File Generated by NixOS journalwatch module.)
|
|
[DEFAULT]
|
|
mail_binary = ${cfg.mailBinary}
|
|
priority = ${toString cfg.priority}
|
|
mail_from = ${cfg.mailFrom}
|
|
''
|
|
+ lib.optionalString (cfg.mailTo != null) ''
|
|
mail_to = ${cfg.mailTo}
|
|
''
|
|
+ cfg.extraConfig
|
|
);
|
|
|
|
journalwatchPatterns = pkgs.writeText "patterns" ''
|
|
# (File Generated by NixOS journalwatch module.)
|
|
|
|
${mkPatterns cfg.filterBlocks}
|
|
'';
|
|
|
|
# empty line at the end needed to to separate the blocks
|
|
mkPatterns =
|
|
filterBlocks:
|
|
lib.concatStringsSep "\n" (
|
|
map (block: ''
|
|
${block.match}
|
|
${block.filters}
|
|
|
|
'') filterBlocks
|
|
);
|
|
|
|
# can't use joinSymlinks directly, because when we point $XDG_CONFIG_HOME
|
|
# to the /nix/store path, we still need the subdirectory "journalwatch" inside that
|
|
# to match journalwatch's expectations
|
|
journalwatchConfigDir =
|
|
pkgs.runCommand "journalwatch-config"
|
|
{
|
|
preferLocalBuild = true;
|
|
allowSubstitutes = false;
|
|
}
|
|
''
|
|
mkdir -p $out/journalwatch
|
|
ln -sf ${journalwatchConfig} $out/journalwatch/config
|
|
ln -sf ${journalwatchPatterns} $out/journalwatch/patterns
|
|
'';
|
|
|
|
in
|
|
{
|
|
options = {
|
|
services.journalwatch = {
|
|
enable = lib.mkOption {
|
|
type = lib.types.bool;
|
|
default = false;
|
|
description = ''
|
|
If enabled, periodically check the journal with journalwatch and report the results by mail.
|
|
'';
|
|
};
|
|
|
|
package = lib.mkPackageOption pkgs "journalwatch" { };
|
|
|
|
priority = lib.mkOption {
|
|
type = lib.types.int;
|
|
default = 6;
|
|
description = ''
|
|
Lowest priority of message to be considered.
|
|
A value between 7 ("debug"), and 0 ("emerg"). Defaults to 6 ("info").
|
|
If you don't care about anything with "info" priority, you can reduce
|
|
this to e.g. 5 ("notice") to considerably reduce the amount of
|
|
messages without needing many {option}`filterBlocks`.
|
|
'';
|
|
};
|
|
|
|
# HACK: this is a workaround for journalwatch's usage of socket.getfqdn() which always returns localhost if
|
|
# there's an alias for the localhost on a separate line in /etc/hosts, or take for ages if it's not present and
|
|
# then return something right-ish in the direction of /etc/hostname. Just bypass it completely.
|
|
mailFrom = lib.mkOption {
|
|
type = lib.types.str;
|
|
default = "journalwatch@${config.networking.hostName}";
|
|
defaultText = lib.literalExpression ''"journalwatch@''${config.networking.hostName}"'';
|
|
description = ''
|
|
Mail address to send journalwatch reports from.
|
|
'';
|
|
};
|
|
|
|
mailTo = lib.mkOption {
|
|
type = lib.types.nullOr lib.types.str;
|
|
default = null;
|
|
description = ''
|
|
Mail address to send journalwatch reports to.
|
|
'';
|
|
};
|
|
|
|
mailBinary = lib.mkOption {
|
|
type = lib.types.path;
|
|
default = "/run/wrappers/bin/sendmail";
|
|
description = ''
|
|
Sendmail-compatible binary to be used to send the messages.
|
|
'';
|
|
};
|
|
|
|
extraConfig = lib.mkOption {
|
|
type = lib.types.str;
|
|
default = "";
|
|
description = ''
|
|
Extra lines to be added verbatim to the journalwatch/config configuration file.
|
|
You can add any commandline argument to the config, without the '--'.
|
|
See `journalwatch --help` for all arguments and their description.
|
|
'';
|
|
};
|
|
|
|
filterBlocks = lib.mkOption {
|
|
type = lib.types.listOf (
|
|
lib.types.submodule {
|
|
options = {
|
|
match = lib.mkOption {
|
|
type = lib.types.str;
|
|
example = "SYSLOG_IDENTIFIER = systemd";
|
|
description = ''
|
|
Syntax: `field = value`
|
|
Specifies the log entry `field` this block should apply to.
|
|
If the `field` of a message matches this `value`,
|
|
this patternBlock's {option}`filters` are applied.
|
|
If `value` starts and ends with a slash, it is interpreted as
|
|
an extended python regular expression, if not, it's an exact match.
|
|
The journal fields are explained in systemd.journal-fields(7).
|
|
'';
|
|
};
|
|
|
|
filters = lib.mkOption {
|
|
type = lib.types.str;
|
|
example = ''
|
|
(Stopped|Stopping|Starting|Started) .*
|
|
(Reached target|Stopped target) .*
|
|
'';
|
|
description = ''
|
|
The filters to apply on all messages which satisfy {option}`match`.
|
|
Any of those messages that match any specified filter will be removed from journalwatch's output.
|
|
Each filter is an extended Python regular expression.
|
|
You can specify multiple filters and separate them by newlines.
|
|
Lines starting with '#' are comments. Inline-comments are not permitted.
|
|
'';
|
|
};
|
|
};
|
|
}
|
|
);
|
|
|
|
example = [
|
|
# examples taken from upstream
|
|
{
|
|
match = "_SYSTEMD_UNIT = systemd-logind.service";
|
|
filters = ''
|
|
New session [a-z]?\d+ of user \w+\.
|
|
Removed session [a-z]?\d+\.
|
|
'';
|
|
}
|
|
|
|
{
|
|
match = "SYSLOG_IDENTIFIER = /(CROND|crond)/";
|
|
filters = ''
|
|
pam_unix\(crond:session\): session (opened|closed) for user \w+
|
|
\(\w+\) CMD .*
|
|
'';
|
|
}
|
|
];
|
|
|
|
# another example from upstream.
|
|
# very useful on priority = 6, and required as journalwatch throws an error when no pattern is defined at all.
|
|
default = [
|
|
{
|
|
match = "SYSLOG_IDENTIFIER = systemd";
|
|
filters = ''
|
|
(Stopped|Stopping|Starting|Started) .*
|
|
(Created slice|Removed slice) user-\d*\.slice\.
|
|
Received SIGRTMIN\+24 from PID .*
|
|
(Reached target|Stopped target) .*
|
|
Startup finished in \d*ms\.
|
|
'';
|
|
}
|
|
];
|
|
|
|
description = ''
|
|
filterBlocks can be defined to blacklist journal messages which are not errors.
|
|
Each block matches on a log entry field, and the filters in that block then are matched
|
|
against all messages with a matching log entry field.
|
|
|
|
All messages whose PRIORITY is at least 6 (INFO) are processed by journalwatch.
|
|
If you don't specify any filterBlocks, PRIORITY is reduced to 5 (NOTICE) by default.
|
|
|
|
All regular expressions are extended Python regular expressions, for details
|
|
see: http://doc.pyschools.com/html/regex.html
|
|
'';
|
|
};
|
|
|
|
interval = lib.mkOption {
|
|
type = lib.types.str;
|
|
default = "hourly";
|
|
description = ''
|
|
How often to run journalwatch.
|
|
|
|
The format is described in systemd.time(7).
|
|
'';
|
|
};
|
|
accuracy = lib.mkOption {
|
|
type = lib.types.str;
|
|
default = "10min";
|
|
description = ''
|
|
The time window around the interval in which the journalwatch run will be scheduled.
|
|
|
|
The format is described in systemd.time(7).
|
|
'';
|
|
};
|
|
};
|
|
};
|
|
|
|
config = lib.mkIf cfg.enable {
|
|
|
|
users.users.${user} = {
|
|
isSystemUser = true;
|
|
home = dataDir;
|
|
group = group;
|
|
};
|
|
|
|
systemd.tmpfiles.rules = [
|
|
# present since NixOS 19.09: remove old stateful symlink join directory,
|
|
# which has been replaced with the journalwatchConfigDir store path
|
|
"R ${dataDir}/config"
|
|
];
|
|
|
|
systemd.services.journalwatch = {
|
|
|
|
environment = {
|
|
# journalwatch stores the last processed timpestamp here
|
|
# the share subdirectory is historic now that config home lives in /nix/store,
|
|
# but moving this in a backwards-compatible way is much more work than what's justified
|
|
# for cleaning that up.
|
|
XDG_DATA_HOME = "${dataDir}/share";
|
|
XDG_CONFIG_HOME = journalwatchConfigDir;
|
|
};
|
|
serviceConfig = {
|
|
User = user;
|
|
Group = group;
|
|
Type = "oneshot";
|
|
# requires a relative directory name to create beneath /var/lib
|
|
StateDirectory = user;
|
|
StateDirectoryMode = "0750";
|
|
ExecStart = "${lib.getExe cfg.package} mail";
|
|
# lowest CPU and IO priority, but both still in best-effort class to prevent starvation
|
|
Nice = 19;
|
|
IOSchedulingPriority = 7;
|
|
};
|
|
};
|
|
|
|
systemd.timers.journalwatch = {
|
|
description = "Periodic journalwatch run";
|
|
wantedBy = [ "timers.target" ];
|
|
timerConfig = {
|
|
OnCalendar = cfg.interval;
|
|
AccuracySec = cfg.accuracy;
|
|
Persistent = true;
|
|
};
|
|
};
|
|
|
|
};
|
|
|
|
meta = {
|
|
maintainers = with lib.maintainers; [ florianjacob ];
|
|
};
|
|
}
|