X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fjournald.conf.xml;h=fe47fdffec70c0a0b7d41ede80644ce86cfb220b;hp=13470b2a43f721de8191d01a443266788929f28c;hb=bdf874d4bfd0292e8240418930fac568134389d2;hpb=3ab1e259d918228c68c1829bd67625e1dc660862
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 13470b2a4..fe47fdffe 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -68,6 +68,46 @@
+
+ Storage=
+
+ Controls where to
+ store journal data. One of
+ volatile,
+ persistent,
+ auto and
+ none. If
+ volatile journal
+ log data will be stored only in
+ memory, i.e. below the
+ /run/log/journal
+ hierarchy (which is created if
+ needed). If
+ persistent data will
+ be stored preferably on disk,
+ i.e. below the
+ /var/log/journal
+ hierarchy (which is created if
+ needed), with a fallback to
+ /run/log/journal
+ (which is created if needed), during
+ early boot and if the disk is not
+ writable. auto is
+ similar to
+ persistent but the
+ directory
+ /var/log/journal
+ is not created if needed, so that its
+ existence controls where log data
+ goes. none turns
+ off all storage, all log data received
+ will be dropped. Forwarding to other
+ targets, such as the console, the
+ kernel log buffer or a syslog daemon
+ will still work however. Defaults to
+ auto.
+
+
Compress=
@@ -81,6 +121,50 @@
system.
+
+ Seal=
+
+ Takes a boolean
+ value. If enabled (the default) and a
+ sealing key is available (as created
+ by
+ journalctl1's
+
+ command), forward secure sealing (FSS) for
+ all persistent journal files is
+ enabled.
+
+
+
+ SplitMode=
+
+ Controls whether to
+ split up journal files per user. One
+ of login,
+ uid and
+ none. If
+ login each logged
+ in user will get his own journal
+ files, but systemd user IDs will log
+ into the system journal. If
+ uid any user ID
+ will get his own journal files
+ regardless whether it belongs to a
+ system service or refers to a real
+ logged in user. If
+ none journal files
+ are not split up per-user and all
+ messages are stored in the single
+ system journal. Note that splitting
+ up journal files per-user is only
+ available of journals are stored
+ persistently. If journals are stored
+ on volatile storage (see above) only a
+ single journal file for all user IDs
+ is kept. Defaults to
+ login.
+
+
RateLimitInterval=RateLimitBurst=
@@ -100,7 +184,7 @@
limiting is applied per-service, so
that two services which log do not
interfere with each other's
- limit. Defaults to 100 messages in
+ limits. Defaults to 200 messages in
10s. The time specification for
RateLimitInterval=
may be specified in the following
@@ -117,11 +201,9 @@
SystemMaxUse=SystemKeepFree=SystemMaxFileSize=
- SystemMinFileSize=RuntimeMaxUse=RuntimeKeepFree=RuntimeMaxFileSize=
- RuntimeMinFileSize=Enforce size limits on
the journal files stored. The options
@@ -164,7 +246,7 @@
configured in
SystemMaxUse= and
RuntimeMaxUse= is
- available. Defaults to 5% of the size
+ available. Defaults to 15% of the size
of the respective file
system. SystemMaxFileSize=
and
@@ -174,26 +256,83 @@
influences the granularity in which
disk space is made available through
rotation, i.e. deletion of historic
- data. Defaults to one eigth of the
+ data. Defaults to one eighth 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 are kept as history. Specify
+ values in bytes or use K, M, G, T, P,
+ E as units for the specified sizes
+ (equal to 1024, 1024²,... bytes).
+ Note that size limits are
+ enforced synchronously to journal
files as they are extended, and need
no explicit rotation step triggered by
time.
+
+ MaxFileSec=
+
+ The maximum time to
+ store entries in a single journal
+ file, before rotating to the next
+ one. Normally time-based rotation
+ should not be required as size-based
+ rotation with options such as
+ SystemMaxFileSize=
+ should be sufficient to ensure that
+ journal files don't grow without
+ bounds. However, to ensure that not
+ too much data is lost at once when old
+ journal files are deleted it might
+ make sense to change this value from
+ the default of one month. Set to 0 to
+ turn off this feature. This setting
+ takes time values which may be
+ suffixed with the units year, month,
+ week, day, h, m to override the
+ default time unit of
+ seconds.
+
+
+
+ MaxRetentionSec=
+
+ The maximum time to
+ store journal entries. This
+ controls whether journal files
+ containing entries older then the
+ specified time span are
+ deleted. Normally time-based deletion
+ of old journal files should not be
+ required as size-based deletion with
+ options such as
+ SystemMaxUse=
+ should be sufficient to ensure that
+ journal files don't grow without
+ bounds. However, to enforce data
+ retention policies it might make sense
+ to change this value from the
+ default of 0 (which turns off this
+ feature). This setting also takes
+ time values which may be suffixed with
+ the units year, month, week, day, h, m
+ to override the default time unit of
+ seconds.
+
+
+
+
+ SyncIntervalSec=
+
+ The timeout before syncing journal
+ data to disk. After syncing journal files have
+ OFFLINE state. Default timeout is 5 minutes.
+
+
+
ForwardToSyslog=ForwardToKMsg=
@@ -210,17 +349,12 @@
is running the respective option has
no effect. By default only forwarding
to syslog is enabled. These settings
- may be overridden at boot time with the
- kernel command line options
- systemd_journald.forward_to_syslog=,
- systemd_journald.forward_to_kmsg=
+ may be overridden 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.
+ systemd.journald.forward_to_console=.
@@ -270,22 +404,6 @@
/dev/console.
-
- 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.
-
-
@@ -297,7 +415,7 @@
systemd-journald.service8,
journalctl1,
systemd.journal-fields7,
- systemd.conf5
+ systemd-system.conf5