summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-11-29 01:07:28 -0800
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-29 13:55:32 -0500
commitbf257aed057efd113f1b84e037fde09ffeed32ee (patch)
tree87a065cc97da336efc576b30014059dbc2a5e0b6 /src
parentbe795898c0d2fa21e3389b89793dcd45c47f8b9f (diff)
journald-remote,journal-upload: Support .d directories in the usual search paths
Diffstat (limited to 'src')
-rw-r--r--src/journal-remote/journal-remote.c8
-rw-r--r--src/journal-remote/journal-upload.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index a5d40cb718..6ec5ad2e77 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -1131,10 +1131,10 @@ static int parse_config(void) {
{ "Remote", "TrustedCertificateFile", config_parse_path, 0, &arg_trust },
{}};
- return config_parse(NULL, PKGSYSCONFDIR "/journal-remote.conf", NULL,
- "Remote\0",
- config_item_table_lookup, items,
- false, false, true, NULL);
+ return config_parse_many(PKGSYSCONFDIR "/journal-remote.conf",
+ CONF_DIRS_NULSTR("systemd/journal-remote.conf"),
+ "Remote\0", config_item_table_lookup, items,
+ false, NULL);
}
static void help(void) {
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 8be0f93b7c..62853b6367 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -532,10 +532,10 @@ static int parse_config(void) {
{ "Upload", "TrustedCertificateFile", config_parse_path, 0, &arg_trust },
{}};
- return config_parse(NULL, PKGSYSCONFDIR "/journal-upload.conf", NULL,
- "Upload\0",
- config_item_table_lookup, items,
- false, false, true, NULL);
+ return config_parse_many(PKGSYSCONFDIR "/journal-upload.conf",
+ CONF_DIRS_NULSTR("systemd/journal-upload.conf"),
+ "Upload\0", config_item_table_lookup, items,
+ false, NULL);
}
static void help(void) {