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

Merge pull request #95353 from flokli/systemd-output-journal

Browse Source 
nixos: remove StandardOutput=syslog, StandardError=syslog lines
This commit is contained in:
Florian Klink 2020-08-13 21:45:12 +02:00 committed by GitHub
commit f3ba51f148
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/hardware/ckb-next.nix
View File

@ -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";
}; };
}; };
}; };

1
nixos/modules/security/tpm2.nix
View File

@ -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";

1
nixos/modules/services/security/privacyidea.nix
View File

@ -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";
}; };
}; };

1
nixos/modules/services/system/earlyoom.nix
View File

@ -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} \

2
nixos/modules/services/wayland/cage.nix
View File

@ -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";
}; };

2
nixos/modules/services/web-apps/tt-rss.nix
View File

@ -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";

1
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -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";

1
nixos/modules/services/x11/display-managers/lightdm.nix
View File

@ -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;

1
nixos/tests/virtualbox.nix
View File

@ -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";
}; };