diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-12-25 11:16:18 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-12-25 11:16:18 -0500 |
| commit | 720e593603dbfc2d2b2a7b9f6e911ad7f09c61b2 (patch) | |
| tree | cbcbd40208db2444d0f98d9d05befc8296678f45 | |
| parent | d790d8c1b23620aa6dfb4131c04b25dea426e1c1 (diff) | |
| parent | 9d3737f13e9b38f88ed7acc800db66c2f025fac9 (diff) | |
Merge pull request #2197 from mscherer/add_seal_config
Add Seal option in the configuration file for journald-remote
| -rw-r--r-- | man/journal-remote.conf.xml | 7 | ||||
| -rw-r--r-- | src/journal-remote/journal-remote.c | 1 | ||||
| -rw-r--r-- | src/journal-remote/journal-remote.conf.in | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml index b7c5e6ac5c..2d345963d9 100644 --- a/man/journal-remote.conf.xml +++ b/man/journal-remote.conf.xml @@ -72,6 +72,13 @@ <literal>[Remote]</literal> section:</para> <variablelist> + <varlistentry> + <term><varname>Seal=</varname></term> + + <listitem><para>Periodically sign the data in the journal using Forward Secure Sealing. + </para></listitem> + </varlistentry> + <varlistentry> <term><varname>SplitMode=</varname></term> diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index b2f5fbf6b4..3f93e85232 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -1181,6 +1181,7 @@ static DEFINE_CONFIG_PARSE_ENUM(config_parse_write_split_mode, static int parse_config(void) { const ConfigTableItem items[] = { + { "Remote", "Seal", config_parse_bool, 0, &arg_seal }, { "Remote", "SplitMode", config_parse_write_split_mode, 0, &arg_split_mode }, { "Remote", "ServerKeyFile", config_parse_path, 0, &arg_key }, { "Remote", "ServerCertificateFile", config_parse_path, 0, &arg_cert }, diff --git a/src/journal-remote/journal-remote.conf.in b/src/journal-remote/journal-remote.conf.in index 3e32f34def..7122d63362 100644 --- a/src/journal-remote/journal-remote.conf.in +++ b/src/journal-remote/journal-remote.conf.in @@ -1,4 +1,5 @@ [Remote] +# Seal=false # SplitMode=host # ServerKeyFile=@CERTIFICATEROOT@/private/journal-remote.pem # ServerCertificateFile=@CERTIFICATEROOT@/certs/journal-remote.pem |