Merge pull request #18573 from peterhoeg/systemd_user_cfg

systemd: support setting defaults for user instances
This commit is contained in:
Eelco Dolstra 2016-09-14 13:39:57 +02:00 committed by GitHub
commit 32d00f50ec

View File

@ -571,6 +571,16 @@ in
'';
};
systemd.user.extraConfig = mkOption {
default = "";
type = types.lines;
example = "DefaultCPUAccounting=yes";
description = ''
Extra config options for systemd user instances. See man systemd-user.conf for
available options.
'';
};
systemd.tmpfiles.rules = mkOption {
type = types.listOf types.str;
default = [];
@ -665,6 +675,11 @@ in
${config.systemd.extraConfig}
'';
"systemd/user.conf".text = ''
[Manager]
${config.systemd.user.extraConfig}
'';
"systemd/journald.conf".text = ''
[Journal]
RateLimitInterval=${config.services.journald.rateLimitInterval}