Ubuntu 24.04 6.1.2.1.2 Ensure systemd-journal-upload authentication i…

…s configured

linux_os/guide/system/logging/journald/systemd_journal_upload_server_tls/bash/shared.sh

@@ -1,10 +1,11 @@
-# platform = multi_platform_slmicro
+# platform = multi_platform_slmicro,multi_platform_ubuntu
 
+{{{ bash_instantiate_variables("var_journal_upload_conf_file") }}}
 {{{ bash_instantiate_variables("var_journal_upload_server_key_file") }}}
-{{{ bash_replace_or_append('/etc/systemd/journal-upload.conf', '^ServerKeyFile', "$var_journal_upload_server_key_file", '%s=%s') }}}
+{{{ bash_replace_or_append('$var_journal_upload_conf_file', '^ServerKeyFile', "$var_journal_upload_server_key_file", '%s=%s') }}}
 
 {{{ bash_instantiate_variables("var_journal_upload_server_certificate_file") }}}
-{{{ bash_replace_or_append('/etc/systemd/journal-upload.conf', '^ServerCertificateFile', "$var_journal_upload_server_certificate_file", '%s=%s') }}}
+{{{ bash_replace_or_append('$var_journal_upload_conf_file', '^ServerCertificateFile', "$var_journal_upload_server_certificate_file", '%s=%s') }}}
 
 {{{ bash_instantiate_variables("var_journal_upload_server_trusted_certificate_file") }}}
-{{{ bash_replace_or_append('/etc/systemd/journal-upload.conf', '^TrustedCertificateFile', "$var_journal_upload_server_trusted_certificate_file", '%s=%s') }}}
+{{{ bash_replace_or_append('$var_journal_upload_conf_file', '^TrustedCertificateFile', "$var_journal_upload_server_trusted_certificate_file", '%s=%s') }}}

linux_os/guide/system/logging/journald/systemd_journal_upload_server_tls/rule.yml

@@ -22,7 +22,7 @@ ocil_clause: 'systemd-journal-upload TLS configuration is missing or commented i
 
 ocil: |-
     To ensure logs are sent securely to a remote host, examine the file
-    <tt>/etc/systemd/journal-upload.conf</tt>.
+    <tt>{{{ xccdf_value("var_journal_upload_server_key_file") }}}</tt>.
     ServerKeyFile should be present:
     <pre>ServerKeyFile={{{ xccdf_value("var_journal_upload_server_key_file") }}}</pre>
     ServerCertificateFile should be present:
@@ -31,6 +31,7 @@ ocil: |-
     <pre>TrustedCertificateFile={{{ xccdf_value("var_journal_upload_server_trusted_certificate_file") }}}</pre>
 
 fixtext: |-
+    Configure systemd-journal-upload config file to {{{ xccdf_value("var_journal_upload_server_key_file") }}}.
     Configure systemd-journal-upload ServerKeyFile to {{{ xccdf_value("var_journal_upload_server_key_file") }}}
     Configure systemd-journal-upload ServerCertificateFile to {{{ xccdf_value("var_journal_upload_server_certificate_file") }}}
     Configure systemd-journal-upload TrustedCertificateFile to {{{ xccdf_value("var_journal_upload_server_trusted_certificate_file") }}}

linux_os/guide/system/logging/journald/systemd_journal_upload_server_tls/tests/journald-conf-d.pass.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# packages = systemd-journal-remote
+# variables = var_journal_upload_conf_file=/etc/systemd/journal-upload.conf.d/60-journald_upload.conf,var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
+
+a_settings=("URL=192.168.50.42" "ServerKeyFile=/etc/ssl/private/journal-upload.pem" \
+    "ServerCertificateFile=/etc/ssl/certs/journal-upload.pem" "TrustedCertificateFile=/etc/ssl/ca/trusted.pem")
+[ ! -d /etc/systemd/journal-upload.conf.d/ ] && mkdir /etc/systemd/journal-upload.conf.d/
+if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf.d/60-journald_upload.conf; then
+    printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+else
+    printf '%s\n' "" "[Upload]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+fi

linux_os/guide/system/logging/journald/systemd_journal_upload_server_tls/tests/journald-conf-servercert-missing.fail.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 # packages = systemd-journal-remote
-# variables = var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
+# variables = var_journal_upload_conf_file=/etc/systemd/journal-upload.conf.d/60-journald_upload.conf,var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
 
 a_settings=("URL=192.168.50.42" "ServerKeyFile=/etc/ssl/private/journal-upload.pem" \
      "TrustedCertificateFile=/etc/ssl/ca/trusted.pem")
 [ ! -d /etc/systemd/journal-upload.conf.d/ ] && mkdir /etc/systemd/journal-upload.conf.d/
 if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf.d/60-journald_upload.conf; then
     printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 else
-    printf '%s\n' "" "[Journal]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+    printf '%s\n' "" "[Upload]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 fi

linux_os/guide/system/logging/journald/systemd_journal_upload_server_tls/tests/journald-conf-servercert.fail.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 # packages = systemd-journal-remote
-# variables = var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
+# variables = var_journal_upload_conf_file=/etc/systemd/journal-upload.conf.d/60-journald_upload.conf,var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
 
 a_settings=("URL=192.168.50.42" "ServerKeyFile=/etc/ssl/private/journal-upload.pem" \
     "ServerCertificateFile=/etc/ssl/certs/journal-upload1.pem" "TrustedCertificateFile=/etc/ssl/ca/trusted.pem")
 [ ! -d /etc/systemd/journal-upload.conf.d/ ] && mkdir /etc/systemd/journal-upload.conf.d/
 if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf.d/60-journald_upload.conf; then
     printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 else
-    printf '%s\n' "" "[Journal]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+    printf '%s\n' "" "[Upload]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 fi

linux_os/guide/system/logging/journald/systemd_journal_upload_server_tls/tests/journald-conf-serverkey-missing.fail sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 # packages = systemd-journal-remote
-# variables = var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
+# variables = var_journal_upload_conf_file=/etc/systemd/journal-upload.conf.d/60-journald_upload.conf,var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
 
 a_settings=("URL=192.168.50.42"  \
     "ServerCertificateFile=/etc/ssl/certs/journal-upload.pem" "TrustedCertificateFile=/etc/ssl/ca/trusted.pem")
 [ ! -d /etc/systemd/journal-upload.conf.d/ ] && mkdir /etc/systemd/journal-upload.conf.d/
 if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf.d/60-journald_upload.conf; then
     printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 else
-    printf '%s\n' "" "[Journal]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+    printf '%s\n' "" "[Upload]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 fi

linux_os/guide/system/logging/journald/systemd_journal_upload_server_tls/tests/journald-conf-serverkey.fail sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 # packages = systemd-journal-remote
-# variables = var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
+# variables = var_journal_upload_conf_file=/etc/systemd/journal-upload.conf.d/60-journald_upload.conf,var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
 
 a_settings=("URL=192.168.50.42" "ServerKeyFile=/etc/ssl/private/journal-upload1.pem" \
     "ServerCertificateFile=/etc/ssl/certs/journal-upload.pem" "TrustedCertificateFile=/etc/ssl/ca/trusted.pem")
 [ ! -d /etc/systemd/journal-upload.conf.d/ ] && mkdir /etc/systemd/journal-upload.conf.d/
 if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf.d/60-journald_upload.conf; then
     printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 else
-    printf '%s\n' "" "[Journal]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+    printf '%s\n' "" "[Upload]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 fi

linux_os/guide/system/logging/journald/systemd_journal_upload_server_tls/tests/journald-conf-trustedcert-missing.fail.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 # packages = systemd-journal-remote
-# variables = var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
+# variables = var_journal_upload_conf_file=/etc/systemd/journal-upload.conf.d/60-journald_upload.conf,var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
 
 a_settings=("URL=192.168.50.42" "ServerKeyFile=/etc/ssl/private/journal-upload.pem" \
     "ServerCertificateFile=/etc/ssl/certs/journal-upload.pem")
 [ ! -d /etc/systemd/journal-upload.conf.d/ ] && mkdir /etc/systemd/journal-upload.conf.d/
 if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf.d/60-journald_upload.conf; then
     printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 else
-    printf '%s\n' "" "[Journal]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+    printf '%s\n' "" "[Upload]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 fi

linux_os/guide/system/logging/journald/systemd_journal_upload_server_tls/tests/journald-conf-trustedcert.fail.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 # packages = systemd-journal-remote
-# variables = var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
+# variables = var_journal_upload_conf_file=/etc/systemd/journal-upload.conf.d/60-journald_upload.conf,var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
 
 a_settings=("URL=192.168.50.42" "ServerKeyFile=/etc/ssl/private/journal-upload.pem" \
     "ServerCertificateFile=/etc/ssl/certs/journal-upload.pem" "TrustedCertificateFile=/etc/ssl/ca/trusted1.pem")
 [ ! -d /etc/systemd/journal-upload.conf.d/ ] && mkdir /etc/systemd/journal-upload.conf.d/
 if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf.d/60-journald_upload.conf; then
     printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 else
-    printf '%s\n' "" "[Journal]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+    printf '%s\n' "" "[Upload]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 fi

linux_os/guide/system/logging/journald/systemd_journal_upload_server_tls/tests/journald-conf.pass.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 # packages = systemd-journal-remote
-# variables = var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
+# variables = var_journal_upload_conf_file=/etc/systemd/journal-upload.conf,var_journal_upload_server_key_file=/etc/ssl/private/journal-upload.pem,var_journal_upload_server_certificate_file=/etc/ssl/certs/journal-upload.pem,var_journal_upload_server_trusted_certificate_file=/etc/ssl/ca/trusted.pem
 
 a_settings=("URL=192.168.50.42" "ServerKeyFile=/etc/ssl/private/journal-upload.pem" \
     "ServerCertificateFile=/etc/ssl/certs/journal-upload.pem" "TrustedCertificateFile=/etc/ssl/ca/trusted.pem")
-[ ! -d /etc/systemd/journal-upload.conf.d/ ] && mkdir /etc/systemd/journal-upload.conf.d/
-if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf.d/60-journald_upload.conf; then
-    printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+[ ! -f /etc/systemd/journal-upload.conf/ ] && touch /etc/systemd/journal-upload.conf
+if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf; then
+    printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf
 else
-    printf '%s\n' "" "[Journal]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+    printf '%s\n' "" "[Upload]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf
 fi

linux_os/guide/system/logging/journald/systemd_journal_upload_url/bash/shared.sh

@@ -1,4 +1,6 @@
-# platform = multi_platform_slmicro
+# platform = multi_platform_slmicro,multi_platform_ubuntu
 
+{{{ bash_instantiate_variables("var_journal_upload_conf_file") }}}
 {{{ bash_instantiate_variables("var_journal_upload_url") }}}
-{{{ bash_replace_or_append('/etc/systemd/journal-upload.conf', '^URL', "$var_journal_upload_url", '%s=%s') }}}
+{{{ bash_replace_or_append('$var_journal_upload_conf_file', '^URL', "$var_journal_upload_url", '%s=%s') }}}
+

linux_os/guide/system/logging/journald/systemd_journal_upload_url/rule.yml

@@ -23,9 +23,10 @@ ocil_clause: 'systemd-journal-upload URL is missing or commented in /etc/systemd
 
 ocil: |-
     To ensure logs are sent to a remote host, examine the file
-    <tt>/etc/systemd/journal-upload.conf</tt>.
+    <tt>{{{ xccdf_value("var_journal_upload_server_key_file") }}}</tt>.
     URL should be present:
     <pre>URL={{{ xccdf_value("var_journal_upload_url") }}}</pre>
 
 fixtext: |-
-    Configure systemd-journal-upload URL to {{{ xccdf_value("var_journal_upload_url") }}}
+   Configure systemd-journal-upload config file to {{{ xccdf_value("var_journal_upload_server_key_file") }}}.
+   Configure systemd-journal-upload URL to {{{ xccdf_value("var_journal_upload_url") }}}

linux_os/guide/system/logging/journald/systemd_journal_upload_url/tests/journald-conf-d-url.pass.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# packages = systemd-journal-remote
+# variables = var_journal_upload_conf_file=/etc/systemd/journal-upload.conf.d/60-journald_upload.conf,var_journal_upload_url=192.168.50.42
+
+a_settings=("URL=192.168.50.42" "ServerKeyFile=/etc/ssl/private/journal-upload.pem" \
+    "ServerCertificateFile=/etc/ssl/certs/journal-upload.pem" "TrustedCertificateFile=/etc/ssl/ca/trusted.pem")
+[ ! -d /etc/systemd/journal-upload.conf.d/ ] && mkdir /etc/systemd/journal-upload.conf.d/
+if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf.d/60-journald_upload.conf; then
+    printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+else
+    printf '%s\n' "" "[Upload]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+fi

linux_os/guide/system/logging/journald/systemd_journal_upload_url/tests/journald-conf-url-missing.fail.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 # packages = systemd-journal-remote
-# variables = var_journal_upload_url=192.168.50.42
+# variables = var_journal_upload_conf_file=/etc/systemd/journal-upload.conf.d/60-journald_upload.conf,var_journal_upload_url=192.168.50.42
 
 a_settings=("ServerKeyFile=/etc/ssl/private/journal-upload.pem" \
      "ServerCertificateFile=/etc/ssl/certs/journal-upload.pem" "TrustedCertificateFile=/etc/ssl/ca/trusted.pem")
 [ ! -d /etc/systemd/journal-upload.conf.d/ ] && mkdir /etc/systemd/journal-upload.conf.d/
 if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf.d/60-journald_upload.conf; then
     printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 else
-    printf '%s\n' "" "[Journal]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+    printf '%s\n' "" "[Upload]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 fi

linux_os/guide/system/logging/journald/systemd_journal_upload_url/tests/journald-conf-url.fail.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 # packages = systemd-journal-remote
-# variables = var_journal_upload_url=192.168.50.42
+# variables = var_journal_upload_conf_file=/etc/systemd/journal-upload.conf.d/60-journald_upload.conf,var_journal_upload_url=192.168.50.42
 
 a_settings=("URL=192.168.50.41" "ServerKeyFile=/etc/ssl/private/journal-upload.pem" \
     "ServerCertificateFile=/etc/ssl/certs/journal-upload.pem" "TrustedCertificateFile=/etc/ssl/ca/trusted.pem")
 [ ! -d /etc/systemd/journal-upload.conf.d/ ] && mkdir /etc/systemd/journal-upload.conf.d/
 if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf.d/60-journald_upload.conf; then
     printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 else
-    printf '%s\n' "" "[Journal]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+    printf '%s\n' "" "[Upload]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
 fi

linux_os/guide/system/logging/journald/systemd_journal_upload_url/tests/journald-conf-url.pass.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 # packages = systemd-journal-remote
-# variables = var_journal_upload_url=192.168.50.42
+# variables = var_journal_upload_conf_file=/etc/systemd/journal-upload.conf,var_journal_upload_url=192.168.50.42
 
 a_settings=("URL=192.168.50.42" "ServerKeyFile=/etc/ssl/private/journal-upload.pem" \
     "ServerCertificateFile=/etc/ssl/certs/journal-upload.pem" "TrustedCertificateFile=/etc/ssl/ca/trusted.pem")
-[ ! -d /etc/systemd/journal-upload.conf.d/ ] && mkdir /etc/systemd/journal-upload.conf.d/
-if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf.d/60-journald_upload.conf; then
-    printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+[ ! -f /etc/systemd/journal-upload.conf ] && mkdir /etc/systemd/journal-upload.conf
+if grep -Psq -- '^\h*\[Upload\]' /etc/systemd/journal-upload.conf; then
+    printf '%s\n' "" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf
 else
-    printf '%s\n' "" "[Journal]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf.d/60-journald_upload.conf
+    printf '%s\n' "" "[Upload]" "${a_settings[@]}" >> /etc/systemd/journal-upload.conf
 fi

linux_os/guide/system/logging/journald/var_journal_upload_conf_file.var

@@ -0,0 +1,14 @@
+documentation_complete: true
+
+title: 'Remote server for systemd-journal-upload service'
+
+description: |-
+    The filepath of the journal-upload config file. Options are /etc/systemd/journal-upload.conf or a 
+    file in the /etc/systemd/journal-upload.conf.d directory.
+
+type: string
+
+interactive: true
+
+options:
+    default: /etc/systemd/journal-upload.conf

linux_os/guide/system/logging/journald/var_journal_upload_server_certificate_file.var

@@ -3,7 +3,7 @@ documentation_complete: true
 title: 'Remote server SSL CA certificate in PEM format for systemd-journal-upload service'
 
 description: |-
-    The setting for ServerCertificateFile in /etc/systemd/journal-upload.conf
+    The setting for ServerCertificateFile in the journal-upload config file.
 
 type: string
 

linux_os/guide/system/logging/journald/var_journal_upload_server_key_file.var

@@ -3,7 +3,7 @@ documentation_complete: true
 title: 'Remote server SSL key in PEM format for systemd-journal-upload service'
 
 description: |-
-    The setting for ServerKeyFile in /etc/systemd/journal-upload.conf
+    The setting for ServerKeyFile in the journal-upload config file.
 
 type: string
 

linux_os/guide/system/logging/journald/var_journal_upload_server_trusted_certificate_file.var

@@ -3,7 +3,7 @@ documentation_complete: true
 title: 'Remote server SSL CA certificate for systemd-journal-upload service'
 
 description: |-
-    The setting for TrustedCertificateFile in /etc/systemd/journal-upload.conf
+    The setting for TrustedCertificateFile in the journal-upload config file.
 
 type: string
 

linux_os/guide/system/logging/journald/var_journal_upload_url.var

@@ -3,7 +3,7 @@ documentation_complete: true
 title: 'Remote server for systemd-journal-upload service'
 
 description: |-
-    The setting for URL in /etc/systemd/journal-upload.conf
+    The setting for URL in the journal-upload config file.
 
 type: string