journal: Add journal.storage credential

In mkosi CI, we want persistent journals when running interactively
and runtime journals when running in CI, so let's add a credential
that allows us to configure which one to use.

diff --git a/NEWS b/NEWS
index 566ee2a9d55c04f5ab81dc7e26b66e025630030e..ba206afdfbc50ba3d1112bd8cb18123673d3006f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -268,6 +268,9 @@ CHANGES WITH 256-rc1:
           added to control the maximum log levels for the messages sent to this
           socket.
 
+        * systemd-journald now also reads the journal.storage credential when
+          determining where to store journal files.
+
         * systemd-vmspawn gained a new --forward-journal= option to forward the
           virtual machine's journal entries to the host. This is done over a
           AF_VSOCK socket, i.e. it does not require networking in the guest.

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 1b07040da49e9d1eda929739ce26c7751d5978fa..2d53eea137a78bc588f88a67d65c0a3c28e4ecbd 100644 (file)
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -103,6 +103,10 @@
         <para>Note that per-user journal files are not supported unless persistent storage is enabled, thus
         making <command>journalctl --user</command> unavailable.</para>
 
+        <para>The storage to use can also be specified via the <literal>journal.storage</literal>
+        credential. Values configured via configuration files take priority over values configured via the
+        credential.</para>
+
         <xi:include href="version-info.xml" xpointer="v186"/>
         </listitem>
       </varlistentry>

diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 8eeb209b07cf8ebeb1ef15076aabfddc4ef6277f..cb06b3b8f8c32500229bb590852e8e5314459404 100644 (file)
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -220,6 +220,37 @@ systemd-tmpfiles --create --prefix /var/log/journal</programlisting>
     </variablelist>
   </refsect1>
 
+  <refsect1>
+    <title>Credentials</title>
+
+    <para><command>systemd-journald</command> supports the service credentials logic as implemented by
+    <varname>ImportCredential=</varname>/<varname>LoadCredential=</varname>/<varname>SetCredential=</varname>
+    (see <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
+    details). The following credentials are used when passed in:</para>
+
+    <variablelist class='system-credentials'>
+      <varlistentry>
+        <term><varname>journal.forward_to_socket</varname></term>
+
+        <listitem><para>May contain a socket address to which logs should be forwarded. See
+        <varname>ForwardToSocket=</varname> in
+        <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+
+        <xi:include href="version-info.xml" xpointer="v256"/></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><varname>journal.storage</varname></term>
+
+        <listitem><para>May be used to specify where journal files should be stored. See
+        <varname>Storage=</varname> in
+        <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+
+        <xi:include href="version-info.xml" xpointer="v256"/></listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
   <refsect1>
     <title>Kernel Command Line</title>
 

diff --git a/man/systemd.system-credentials.xml b/man/systemd.system-credentials.xml
index e8e2985a42b26e11c1b8fca909292984d6f5e8f4..d9fbae25eecf5780f9685bd7d59237156f23e80d 100644 (file)
--- a/man/systemd.system-credentials.xml
+++ b/man/systemd.system-credentials.xml
@@ -309,6 +309,18 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><varname>journal.storage</varname></term>
+        <listitem>
+          <para>Used by
+          <citerefentry><refentrytitle>systemd-journald</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+          to determine where to store journal files, see
+          <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details.</para>
+
+          <xi:include href="version-info.xml" xpointer="v256"/>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>vmm.notify_socket</varname></term>
         <listitem>

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index c78678f1f6f255f6f1a279d8a3cbee39b1f0854a..dfad063e47ec176f30e05a5d22dba6462ddb45eb 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -2522,17 +2522,27 @@ static void server_load_credentials(Server *s) {
 
         assert(s);
 
-        /* if we already have a forward address from config don't load the credential */
-        if (s->forward_to_socket.sockaddr.sa.sa_family != AF_UNSPEC)
-                return log_debug("Socket forward address already set not loading journal.forward_to_socket");
-
         r = read_credential("journal.forward_to_socket", &data, NULL);
         if (r < 0)
-                return (void) log_debug_errno(r, "Failed to read credential journal.forward_to_socket, ignoring: %m");
+                log_debug_errno(r, "Failed to read credential journal.forward_to_socket, ignoring: %m");
+        else {
+                r = socket_address_parse(&s->forward_to_socket, data);
+                if (r < 0)
+                        log_debug_errno(r, "Failed to parse socket address '%s' from credential journal.forward_to_socket, ignoring: %m", (char *) data);
+        }
+
+        data = mfree(data);
 
-        r = socket_address_parse(&s->forward_to_socket, data);
+        r = read_credential("journal.storage", &data, NULL);
         if (r < 0)
-                log_debug_errno(r, "Failed to parse credential journal.forward_to_socket, ignoring: %m");
+                log_debug_errno(r, "Failed to read credential journal.storage, ignoring: %m");
+        else {
+                r = storage_from_string(data);
+                if (r < 0)
+                        log_debug_errno(r, "Failed to parse storage '%s' from credential journal.storage, ignoring: %m", (char *) data);
+                else
+                        s->storage = r;
+        }
 }
 
 int server_new(Server **ret) {
@@ -2617,9 +2627,8 @@ int server_init(Server *s, const char *namespace) {
         journal_reset_metrics(&s->system_storage.metrics);
         journal_reset_metrics(&s->runtime_storage.metrics);
 
-        server_parse_config_file(s);
-
         server_load_credentials(s);
+        server_parse_config_file(s);
 
         if (!s->namespace) {
                 /* Parse kernel command line, but only if we are not a namespace instance */