X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fjournald.conf.xml;h=6e43914f23e32893f4a5abe591a2f2319a0e3720;hb=1e158d273bb63883566358cbb886cd4167421df6;hp=2fa475c94c8220c7bd54062be30abc177daadab3;hpb=eb53b74f7e2f83d936b35107806a157fdffdbf5a;p=elogind.git
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 2fa475c94..6e43914f2 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -130,9 +130,45 @@
by
journalctl1's
- command), forward secure sealing (FSS) for
- all persistent journal files is
- enabled.
+ command), forward secure sealing (FSS)
+ for all persistent journal files is
+ enabled. FSS is based on Seekable
+ Sequential Key Generators by
+ G. A. Marson and B. Poettering and
+ may be used to protect journal files
+ from unnoticed
+ alteration.
+
+
+
+ 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.
@@ -154,7 +190,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
@@ -171,11 +207,9 @@
SystemMaxUse=SystemKeepFree=SystemMaxFileSize=
- SystemMinFileSize=RuntimeMaxUse=RuntimeKeepFree=RuntimeMaxFileSize=
- RuntimeMinFileSize=Enforce size limits on
the journal files stored. The options
@@ -203,7 +237,17 @@
while the former apply if persistent
logging is enabled and the system is
fully booted
- up. SystemMaxUse=
+ up. journalctl and
+ systemd-journald
+ ignore all files with names not ending
+ with .journal or
+ .journal~, so only
+ such files, located in the appropriate
+ directories, are taken into account
+ when calculating current disk usage.
+
+
+ SystemMaxUse=
and RuntimeMaxUse=
control how much disk space the
journal may use up at
@@ -218,7 +262,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
@@ -233,19 +277,76 @@
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.
+ 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 when journal files
+ are extended, and no explicit
+ rotation step triggered by
+ time is needed.
+
+
+
+ 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.
+
@@ -330,7 +431,7 @@
systemd-journald.service8,
journalctl1,
systemd.journal-fields7,
- systemd.conf5
+ systemd-system.conf5