From 18b754d345ecb0b15e369978aaffa72e9814b86a Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 30 Mar 2012 23:18:33 +0200 Subject: rename /etc/systemd/systemd-{login,journal}d.conf to {login,journal}d.conf --- man/journalctl.xml | 3 +- man/journald.conf.xml | 254 ++++++++++++++++++++++++++++++++++++++++++ man/loginctl.xml | 3 +- man/logind.conf.xml | 175 +++++++++++++++++++++++++++++ man/pam_systemd.xml | 4 +- man/systemctl.xml | 1 - man/systemd-journald.conf.xml | 254 ------------------------------------------ man/systemd-logind.conf.xml | 175 ----------------------------- 8 files changed, 433 insertions(+), 436 deletions(-) create mode 100644 man/journald.conf.xml create mode 100644 man/logind.conf.xml delete mode 100644 man/systemd-journald.conf.xml delete mode 100644 man/systemd-logind.conf.xml (limited to 'man') diff --git a/man/journalctl.xml b/man/journalctl.xml index efceefa43f..f6e46cfbc7 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -44,7 +44,6 @@ journalctl - systemd-journalctl Query the systemd journal @@ -254,7 +253,7 @@ systemd1, systemctl1, - systemd-journald.conf5 + journald.conf5 diff --git a/man/journald.conf.xml b/man/journald.conf.xml new file mode 100644 index 0000000000..a9b0f66de9 --- /dev/null +++ b/man/journald.conf.xml @@ -0,0 +1,254 @@ + + + + + + + + + journald.conf + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + journald.conf + 5 + + + + journald.conf + Journal service configuration file + + + + journald.conf + + + + Description + + This files configures various parameters of the systemd journal service. + + + + + Options + + All options are configured in the + [Journal] section: + + + + + Compress= + + Takes a boolean + value. If enabled (the default) data + objects that shall be stored in the + journal and are larger than a certain + threshold are compressed with the XZ + compression algorithm before they are + written to the file + system. + + + + RateLimitInterval= + RateLimitBurst= + + Configures the rate + limiting that is applied to all + messages generated on the system. If + in the time interval defined by + RateLimitInterval= + more messages than specified in + RateLimitBurst= are + logged by a service all further + messages within the interval are + dropped, until the interval is over. A + message about the number of dropped + messages is generated. This rate + limiting is applied per-service, so + that two services which log do not + interfere with each other's + limit. Defaults to 100 messages in + 10s. The time specification for + RateLimitInterval= + may be specified in the following + units: s, + min, + h, + ms, + us. To turn off any + kind of rate limiting, set either + value to 0. + + + + SystemMaxUse= + SystemKeepFree= + SystemMaxFileSize= + SystemMinFileSize= + RuntimeMaxUse= + RuntimeKeepFree= + RuntimeMaxFileSize= + RuntimeMinFileSize= + + Enforce size limits on + the journal files stored. The options + prefixed with + System apply to the + journal files when stored on a + persistant file system, more + specifically + /var/log/journal. The + options prefixed with + Runtime apply to + the journal files when stored on a + volatile in-memory file system, more + specifically + /run/log/journal. The + former is used only when + /var is mounted, + writable and the directory + /var/log/journal + exists. Otherwise only the latter + applies. Note that this means that + during early boot and if the + administrator disabled persistant + logging only the latter options apply, + while the former apply if persistant + logging is enabled and the system is + fully booted + up. SystemMaxUse= + and RuntimeMaxUse= + control how much disk space the + journal may use up at + maximum. Defaults to 10% of the size + of the respective file + system. SystemKeepFree= + and + RuntimeKeepFree= + control how much disk space the + journal shall always leave free for + other uses if less than the disk space + configured in + SystemMaxUse= and + RuntimeMaxUse= is + available. Defaults to 5% of the size + of the respective file + system. SystemMaxFileSize= + and + RuntimeMaxFileSize= + control how large individual journal + files may grow at maximum. This + influences the granularity in which + disk space is made available through + rotation, i.e. deletion of historic + data. Defaults to one eigth of the + values configured with + SystemMaxUse= and + RuntimeMaxUse=, so + that usually seven rotated journal + files are kept as + history. SystemMinFileSize= + and + RuntimeMinFileSize= + control how large individual journal + files grow at minimum. Defaults to + 64K. Specify values in bytes or use + K, M, G, T, P, E as units for the + specified sizes. Note that size limits + are enforced synchronously to journal + files as they are extended, and need + no explicit rotation step triggered by + time. + + + + ForwardToSyslog= + ForwardToKMsg= + ForwardToConsole= + + Control whether log + messages received by the journal + daemon shall be forwarded to a + traditional syslog daemon, to the + kernel log buffer (kmsg), or to the + system console. These options take + boolean arguments. If forwarding to + syslog is enabled but no syslog daemon + is running the respective option has + no effect. By default only forwarding + to syslog is enabled. These settings + may be overriden at boot time with the + kernel command line options + systemd_journald.forward_to_syslog=, + systemd_journald.forward_to_kmsg= + and + systemd_journald.forward_to_console=. If + forwarding to the kernel log buffer and + ImportKernel= is + enabled at the same time care is taken + to avoid logging loops. It is safe to + use these options in combination. + + + + + ImportKernel= + + Controls whether + kernel log messages shall be stored in + the journal. Takes a boolean argument + and defaults to enabled. Note that + currently only one userspace service + can read kernel messages at a time, + which means that kernel log message + reading might get corrupted if it + is enabled in more than one service, + for example in both the journal and a + traditional syslog service. + + + + + + + + See Also + + systemd1, + journalctl1, + systemd.conf5 + + + + diff --git a/man/loginctl.xml b/man/loginctl.xml index be72cc331a..af1d631cf4 100644 --- a/man/loginctl.xml +++ b/man/loginctl.xml @@ -44,7 +44,6 @@ loginctl - systemd-loginctl Control the systemd login manager @@ -451,7 +450,7 @@ systemd1, systemctl1, - systemd-logind.conf5 + logind.conf5 diff --git a/man/logind.conf.xml b/man/logind.conf.xml new file mode 100644 index 0000000000..950f81fa93 --- /dev/null +++ b/man/logind.conf.xml @@ -0,0 +1,175 @@ + + + + + + + + + logind.conf + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + logind.conf + 5 + + + + logind.conf + Login manager configuration file + + + + logind.conf + + + + Description + + This files configures various parameters of the systemd login manager. + + + + + Options + + All options are configured in the + [Login] section: + + + + + NAutoVTs= + + Takes a positive + integer. How many virtual terminals to + allocate by default and when switched + to autospawn autovt + services on (if they are otherwise + unused). These services are + instantiated from a template of + autovt@.service + with the virtual terminal TTY name, + e.g. autovt@tty4.service. By + default + autovt@.service + is linked to + getty@.service, + i.e. login prompts are started + dynamically as the user switches to + unused virtual terminals, and this + parameter hence controls how many + gettys are available on the virtual + terminals. Defaults to 6. When set to + 0, automatic spawning of + autovt services is + disabled. + + + + KillUserProcesses= + + Takes a boolean + argument. Configures whether the + processes of a user should be killed + when she or he completely logs out (i.e. after + her/his last session ended). Defaults to + no. + + + + KillOnlyUsers= + KillExcludeUsers= + + These settings take + space separated lists of user names + that influence the effect of + KillUserProcesses=. If + not empty only processes of users + listed in + KillOnlyUsers will + be killed when they log out + entirely. Processes of users listed in + KillExcludeUsers= + are excluded from being + killed. KillExcludeUsers= + defaults to root + and takes precedence over + KillOnlyUsers= + which defaults to the empty list. + + + + Controllers= + ResetControllers= + + These settings control + the default control group hierarchies + users logging are added to. When + logging in users will get private + control groups in all hierarchies + listed in + Controllers= and be + reset to the root control group in all + hierarchies listed in + ResetControllers=. Controllers= + defaults to the empty list, + ResetControllers= + defaults to + cpu. + + + + Note that setting + KillUserProcesses=1 will break tools + like + screen1. + + Note that KillUserProcesses=1 + is a weaker version of + kill-session-processes=1 which may + be configured per-service for + pam_systemd8. The + latter kills processes of a session as soon as it + ends, the former kills processes as soon as the last + session of the user ends. + + + + See Also + + systemd1, + loginctl1, + systemd.conf5 + + + + diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml index 883b50b640..c07b46bab2 100644 --- a/man/pam_systemd.xml +++ b/man/pam_systemd.xml @@ -212,7 +212,7 @@ stricter version of KillUserProcesses=1 which may be configured system-wide in - systemd-logind.conf5. The + logind.conf5. The former kills processes of a session as soon as it ends, the latter kills processes as soon as the last session of the user ends. @@ -308,7 +308,7 @@ session required pam_systemd.so kill-session-processes=1 pam.d5, pam8, pam_loginuid8, - systemd-logind.conf5, + logind.conf5, systemd1 diff --git a/man/systemctl.xml b/man/systemctl.xml index 25b9266d49..968da84e36 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -44,7 +44,6 @@ systemctl - systemd-systemctl Control the systemd system and service manager diff --git a/man/systemd-journald.conf.xml b/man/systemd-journald.conf.xml deleted file mode 100644 index 37dae68b36..0000000000 --- a/man/systemd-journald.conf.xml +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - - - systemd-journald.conf - systemd - - - - Developer - Lennart - Poettering - lennart@poettering.net - - - - - - systemd-journald.conf - 5 - - - - systemd-journald.conf - Journal service configuration file - - - - systemd-journald.conf - - - - Description - - This files configures various parameters of the systemd journal service. - - - - - Options - - All options are configured in the - [Journal] section: - - - - - Compress= - - Takes a boolean - value. If enabled (the default) data - objects that shall be stored in the - journal and are larger than a certain - threshold are compressed with the XZ - compression algorithm before they are - written to the file - system. - - - - RateLimitInterval= - RateLimitBurst= - - Configures the rate - limiting that is applied to all - messages generated on the system. If - in the time interval defined by - RateLimitInterval= - more messages than specified in - RateLimitBurst= are - logged by a service all further - messages within the interval are - dropped, until the interval is over. A - message about the number of dropped - messages is generated. This rate - limiting is applied per-service, so - that two services which log do not - interfere with each other's - limit. Defaults to 100 messages in - 10s. The time specification for - RateLimitInterval= - may be specified in the following - units: s, - min, - h, - ms, - us. To turn off any - kind of rate limiting, set either - value to 0. - - - - SystemMaxUse= - SystemKeepFree= - SystemMaxFileSize= - SystemMinFileSize= - RuntimeMaxUse= - RuntimeKeepFree= - RuntimeMaxFileSize= - RuntimeMinFileSize= - - Enforce size limits on - the journal files stored. The options - prefixed with - System apply to the - journal files when stored on a - persistant file system, more - specifically - /var/log/journal. The - options prefixed with - Runtime apply to - the journal files when stored on a - volatile in-memory file system, more - specifically - /run/log/journal. The - former is used only when - /var is mounted, - writable and the directory - /var/log/journal - exists. Otherwise only the latter - applies. Note that this means that - during early boot and if the - administrator disabled persistant - logging only the latter options apply, - while the former apply if persistant - logging is enabled and the system is - fully booted - up. SystemMaxUse= - and RuntimeMaxUse= - control how much disk space the - journal may use up at - maximum. Defaults to 10% of the size - of the respective file - system. SystemKeepFree= - and - RuntimeKeepFree= - control how much disk space the - journal shall always leave free for - other uses if less than the disk space - configured in - SystemMaxUse= and - RuntimeMaxUse= is - available. Defaults to 5% of the size - of the respective file - system. SystemMaxFileSize= - and - RuntimeMaxFileSize= - control how large individual journal - files may grow at maximum. This - influences the granularity in which - disk space is made available through - rotation, i.e. deletion of historic - data. Defaults to one eigth of the - values configured with - SystemMaxUse= and - RuntimeMaxUse=, so - that usually seven rotated journal - files are kept as - history. SystemMinFileSize= - and - RuntimeMinFileSize= - control how large individual journal - files grow at minimum. Defaults to - 64K. Specify values in bytes or use - K, M, G, T, P, E as units for the - specified sizes. Note that size limits - are enforced synchronously to journal - files as they are extended, and need - no explicit rotation step triggered by - time. - - - - ForwardToSyslog= - ForwardToKMsg= - ForwardToConsole= - - Control whether log - messages received by the journal - daemon shall be forwarded to a - traditional syslog daemon, to the - kernel log buffer (kmsg), or to the - system console. These options take - boolean arguments. If forwarding to - syslog is enabled but no syslog daemon - is running the respective option has - no effect. By default only forwarding - to syslog is enabled. These settings - may be overriden at boot time with the - kernel command line options - systemd_journald.forward_to_syslog=, - systemd_journald.forward_to_kmsg= - and - systemd_journald.forward_to_console=. If - forwarding to the kernel log buffer and - ImportKernel= is - enabled at the same time care is taken - to avoid logging loops. It is safe to - use these options in combination. - - - - - ImportKernel= - - Controls whether - kernel log messages shall be stored in - the journal. Takes a boolean argument - and defaults to enabled. Note that - currently only one userspace service - can read kernel messages at a time, - which means that kernel log message - reading might get corrupted if it - is enabled in more than one service, - for example in both the journal and a - traditional syslog service. - - - - - - - - See Also - - systemd1, - journalctl1, - systemd.conf5 - - - - diff --git a/man/systemd-logind.conf.xml b/man/systemd-logind.conf.xml deleted file mode 100644 index 27c11c2904..0000000000 --- a/man/systemd-logind.conf.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - systemd-logind.conf - systemd - - - - Developer - Lennart - Poettering - lennart@poettering.net - - - - - - systemd-logind.conf - 5 - - - - systemd-logind.conf - Login manager configuration file - - - - systemd-logind.conf - - - - Description - - This files configures various parameters of the systemd login manager. - - - - - Options - - All options are configured in the - [Login] section: - - - - - NAutoVTs= - - Takes a positive - integer. How many virtual terminals to - allocate by default and when switched - to autospawn autovt - services on (if they are otherwise - unused). These services are - instantiated from a template of - autovt@.service - with the virtual terminal TTY name, - e.g. autovt@tty4.service. By - default - autovt@.service - is linked to - getty@.service, - i.e. login prompts are started - dynamically as the user switches to - unused virtual terminals, and this - parameter hence controls how many - gettys are available on the virtual - terminals. Defaults to 6. When set to - 0, automatic spawning of - autovt services is - disabled. - - - - KillUserProcesses= - - Takes a boolean - argument. Configures whether the - processes of a user should be killed - when she or he completely logs out (i.e. after - her/his last session ended). Defaults to - no. - - - - KillOnlyUsers= - KillExcludeUsers= - - These settings take - space separated lists of user names - that influence the effect of - KillUserProcesses=. If - not empty only processes of users - listed in - KillOnlyUsers will - be killed when they log out - entirely. Processes of users listed in - KillExcludeUsers= - are excluded from being - killed. KillExcludeUsers= - defaults to root - and takes precedence over - KillOnlyUsers= - which defaults to the empty list. - - - - Controllers= - ResetControllers= - - These settings control - the default control group hierarchies - users logging are added to. When - logging in users will get private - control groups in all hierarchies - listed in - Controllers= and be - reset to the root control group in all - hierarchies listed in - ResetControllers=. Controllers= - defaults to the empty list, - ResetControllers= - defaults to - cpu. - - - - Note that setting - KillUserProcesses=1 will break tools - like - screen1. - - Note that KillUserProcesses=1 - is a weaker version of - kill-session-processes=1 which may - be configured per-service for - pam_systemd8. The - latter kills processes of a session as soon as it - ends, the former kills processes as soon as the last - session of the user ends. - - - - See Also - - systemd1, - loginctl1, - systemd.conf5 - - - - -- cgit v1.2.3-54-g00ecf