mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-14 21:49:34 +03:00
nixos: remove StandardOutput=syslog, StandardError=syslog lines
Since systemd 243, docs were already steering users towards using `journal`:eedaf7f322
systemd 246 will go one step further, it shows warnings for these units during bootup, and will [automatically convert these occurences to `journal`](f3dc6af20f
): > [ 6.955976] systemd[1]: /nix/store/hwyfgbwg804vmr92fxc1vkmqfq2k9s17-unit-display-manager.service/display-manager.service:27: Standard output type syslog is obsolete, automatically updating to journal. Please update│······················ your unit file, and consider removing the setting altogether. So there's no point of keeping `syslog` here, and it's probably a better idea to just not set it, due to: > This setting defaults to the value set with DefaultStandardOutput= in > systemd-system.conf(5), which defaults to journal.
This commit is contained in:
parent
e2eb3289b0
commit
962e15aebc
9 changed files with 0 additions and 11 deletions
|
@ -43,7 +43,6 @@ in
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${cfg.package}/bin/ckb-next-daemon ${optionalString (cfg.gid != null) "--gid=${builtins.toString cfg.gid}"}";
|
ExecStart = "${cfg.package}/bin/ckb-next-daemon ${optionalString (cfg.gid != null) "--gid=${builtins.toString cfg.gid}"}";
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
StandardOutput = "syslog";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -170,7 +170,6 @@ in {
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
RestartSec = 30;
|
RestartSec = 30;
|
||||||
BusName = "com.intel.tss2.Tabrmd";
|
BusName = "com.intel.tss2.Tabrmd";
|
||||||
StandardOutput = "syslog";
|
|
||||||
ExecStart = "${cfg.abrmd.package}/bin/tpm2-abrmd";
|
ExecStart = "${cfg.abrmd.package}/bin/tpm2-abrmd";
|
||||||
User = "tss";
|
User = "tss";
|
||||||
Group = "nogroup";
|
Group = "nogroup";
|
||||||
|
|
|
@ -234,7 +234,6 @@ in
|
||||||
ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
|
ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
|
||||||
NotifyAccess = "main";
|
NotifyAccess = "main";
|
||||||
KillSignal = "SIGQUIT";
|
KillSignal = "SIGQUIT";
|
||||||
StandardError = "syslog";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -106,7 +106,6 @@ in
|
||||||
path = optional ecfg.enableNotifications pkgs.dbus;
|
path = optional ecfg.enableNotifications pkgs.dbus;
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
StandardOutput = "null";
|
StandardOutput = "null";
|
||||||
StandardError = "syslog";
|
|
||||||
ExecStart = ''
|
ExecStart = ''
|
||||||
${pkgs.earlyoom}/bin/earlyoom \
|
${pkgs.earlyoom}/bin/earlyoom \
|
||||||
-m ${toString ecfg.freeMemThreshold} \
|
-m ${toString ecfg.freeMemThreshold} \
|
||||||
|
|
|
@ -73,8 +73,6 @@ in {
|
||||||
TTYVTDisallocate = "yes";
|
TTYVTDisallocate = "yes";
|
||||||
# Fail to start if not controlling the virtual terminal.
|
# Fail to start if not controlling the virtual terminal.
|
||||||
StandardInput = "tty-fail";
|
StandardInput = "tty-fail";
|
||||||
StandardOutput = "syslog";
|
|
||||||
StandardError = "syslog";
|
|
||||||
# Set up a full (custom) user session for the user, required by Cage.
|
# Set up a full (custom) user session for the user, required by Cage.
|
||||||
PAMName = "cage";
|
PAMName = "cage";
|
||||||
};
|
};
|
||||||
|
|
|
@ -632,8 +632,6 @@ let
|
||||||
User = "${cfg.user}";
|
User = "${cfg.user}";
|
||||||
Group = "tt_rss";
|
Group = "tt_rss";
|
||||||
ExecStart = "${pkgs.php}/bin/php ${cfg.root}/update.php --daemon --quiet";
|
ExecStart = "${pkgs.php}/bin/php ${cfg.root}/update.php --daemon --quiet";
|
||||||
StandardOutput = "syslog";
|
|
||||||
StandardError = "syslog";
|
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
RestartSec = "60";
|
RestartSec = "60";
|
||||||
SyslogIdentifier = "tt-rss";
|
SyslogIdentifier = "tt-rss";
|
||||||
|
|
|
@ -200,7 +200,6 @@ in
|
||||||
KillMode = "mixed";
|
KillMode = "mixed";
|
||||||
IgnoreSIGPIPE = "no";
|
IgnoreSIGPIPE = "no";
|
||||||
BusName = "org.gnome.DisplayManager";
|
BusName = "org.gnome.DisplayManager";
|
||||||
StandardOutput = "syslog";
|
|
||||||
StandardError = "inherit";
|
StandardError = "inherit";
|
||||||
ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
|
ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
|
||||||
KeyringMode = "shared";
|
KeyringMode = "shared";
|
||||||
|
|
|
@ -253,7 +253,6 @@ in
|
||||||
KeyringMode = "shared";
|
KeyringMode = "shared";
|
||||||
KillMode = "mixed";
|
KillMode = "mixed";
|
||||||
StandardError = "inherit";
|
StandardError = "inherit";
|
||||||
StandardOutput = "syslog";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.etc."lightdm/lightdm.conf".source = lightdmConf;
|
environment.etc."lightdm/lightdm.conf".source = lightdmConf;
|
||||||
|
|
|
@ -198,7 +198,6 @@ let
|
||||||
systemd.services."vboxtestlog-${name}@" = {
|
systemd.services."vboxtestlog-${name}@" = {
|
||||||
description = "VirtualBox Test Machine Log For ${name}";
|
description = "VirtualBox Test Machine Log For ${name}";
|
||||||
serviceConfig.StandardInput = "socket";
|
serviceConfig.StandardInput = "socket";
|
||||||
serviceConfig.StandardOutput = "syslog";
|
|
||||||
serviceConfig.SyslogIdentifier = "GUEST-${name}";
|
serviceConfig.SyslogIdentifier = "GUEST-${name}";
|
||||||
serviceConfig.ExecStart = "${pkgs.coreutils}/bin/cat";
|
serviceConfig.ExecStart = "${pkgs.coreutils}/bin/cat";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue