diff options
Diffstat (limited to 'src/journal-remote/journal-upload.c')
| -rw-r--r-- | src/journal-remote/journal-upload.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 92ce56805a..6302266ccb 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -19,23 +19,29 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include <curl/curl.h> #include <fcntl.h> #include <getopt.h> #include <stdio.h> #include <sys/stat.h> -#include <curl/curl.h> #include "sd-daemon.h" +#include "alloc-util.h" #include "conf-parser.h" +#include "def.h" +#include "fd-util.h" #include "fileio.h" #include "formats-util.h" +#include "glob-util.h" +#include "journal-upload.h" #include "log.h" #include "mkdir.h" +#include "parse-util.h" #include "sigbus.h" #include "signal-util.h" +#include "string-util.h" #include "util.h" -#include "journal-upload.h" #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem" #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-upload.pem" @@ -536,7 +542,7 @@ static int parse_config(void) { {}}; return config_parse_many(PKGSYSCONFDIR "/journal-upload.conf", - CONF_DIRS_NULSTR("systemd/journal-upload.conf"), + CONF_PATHS_NULSTR("systemd/journal-upload.conf.d"), "Upload\0", config_item_table_lookup, items, false, NULL); } |