mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-12 20:55:31 +03:00
d9d87c5196
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 a08b3a4d19.tar.gz \
--argstr baseRev 0128fbb0a5
result/bin/apply-formatting $NIXPKGS_PATH
132 lines
3.1 KiB
Nix
132 lines
3.1 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
...
|
|
}:
|
|
let
|
|
|
|
cfg = config.services.syslogd;
|
|
|
|
syslogConf = pkgs.writeText "syslog.conf" ''
|
|
${lib.optionalString (cfg.tty != "") "kern.warning;*.err;authpriv.none /dev/${cfg.tty}"}
|
|
${cfg.defaultConfig}
|
|
${cfg.extraConfig}
|
|
'';
|
|
|
|
defaultConf = ''
|
|
# Send emergency messages to all users.
|
|
*.emerg *
|
|
|
|
# "local1" is used for dhcpd messages.
|
|
local1.* -/var/log/dhcpd
|
|
|
|
mail.* -/var/log/mail
|
|
|
|
*.=warning;*.=err -/var/log/warn
|
|
*.crit /var/log/warn
|
|
|
|
*.*;mail.none;local1.none -/var/log/messages
|
|
'';
|
|
|
|
in
|
|
|
|
{
|
|
###### interface
|
|
|
|
options = {
|
|
|
|
services.syslogd = {
|
|
|
|
enable = lib.mkOption {
|
|
type = lib.types.bool;
|
|
default = false;
|
|
description = ''
|
|
Whether to enable syslogd. Note that systemd also logs
|
|
syslog messages, so you normally don't need to run syslogd.
|
|
'';
|
|
};
|
|
|
|
tty = lib.mkOption {
|
|
type = lib.types.str;
|
|
default = "tty10";
|
|
description = ''
|
|
The tty device on which syslogd will print important log
|
|
messages. Leave this option blank to disable tty logging.
|
|
'';
|
|
};
|
|
|
|
defaultConfig = lib.mkOption {
|
|
type = lib.types.lines;
|
|
default = defaultConf;
|
|
description = ''
|
|
The default {file}`syslog.conf` file configures a
|
|
fairly standard setup of log files, which can be extended by
|
|
means of {var}`extraConfig`.
|
|
'';
|
|
};
|
|
|
|
enableNetworkInput = lib.mkOption {
|
|
type = lib.types.bool;
|
|
default = false;
|
|
description = ''
|
|
Accept logging through UDP. Option -r of syslogd(8).
|
|
'';
|
|
};
|
|
|
|
extraConfig = lib.mkOption {
|
|
type = lib.types.lines;
|
|
default = "";
|
|
example = "news.* -/var/log/news";
|
|
description = ''
|
|
Additional text appended to {file}`syslog.conf`,
|
|
i.e. the contents of {var}`defaultConfig`.
|
|
'';
|
|
};
|
|
|
|
extraParams = lib.mkOption {
|
|
type = lib.types.listOf lib.types.str;
|
|
default = [ ];
|
|
example = [ "-m 0" ];
|
|
description = ''
|
|
Additional parameters passed to {command}`syslogd`.
|
|
'';
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
###### implementation
|
|
|
|
config = lib.mkIf cfg.enable {
|
|
|
|
assertions = [
|
|
{
|
|
assertion = !config.services.rsyslogd.enable;
|
|
message = "rsyslogd conflicts with syslogd";
|
|
}
|
|
];
|
|
|
|
environment.systemPackages = [ pkgs.sysklogd ];
|
|
|
|
services.syslogd.extraParams = lib.optional cfg.enableNetworkInput "-r";
|
|
|
|
# FIXME: restarting syslog seems to break journal logging.
|
|
systemd.services.syslog = {
|
|
description = "Syslog Daemon";
|
|
|
|
requires = [ "syslog.socket" ];
|
|
|
|
wantedBy = [ "multi-user.target" ];
|
|
|
|
serviceConfig = {
|
|
ExecStart = "${pkgs.sysklogd}/sbin/syslogd ${toString cfg.extraParams} -f ${syslogConf} -n";
|
|
# Prevent syslogd output looping back through journald.
|
|
StandardOutput = "null";
|
|
};
|
|
};
|
|
|
|
};
|
|
|
|
}
|