|
 |
4b6aa8 |
From 8d19dea8d110d52f3df475b37fac5c26f3c7387d Mon Sep 17 00:00:00 2001
|
|
|
4b6aa8 |
From: Matej Habrnal <mhabrnal@redhat.com>
|
|
|
4b6aa8 |
Date: Mon, 21 Mar 2016 13:55:42 +0100
|
|
|
4b6aa8 |
Subject: [PATCH] uploader: /etc/libreport/plugins/upload.conf as default conf
|
|
|
4b6aa8 |
file
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
Due to the possibility to configure SSH keys we added a default configuration
|
|
|
4b6aa8 |
file as well. Users can define SSH keys as well as URL where dump dirs are
|
|
|
4b6aa8 |
going to be uploaded.
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
Related to rhbz#1289513
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
|
|
|
4b6aa8 |
---
|
|
|
4b6aa8 |
src/plugins/Makefile.am | 1 +
|
|
|
4b6aa8 |
src/plugins/reporter-upload.c | 2 +-
|
|
|
4b6aa8 |
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
|
|
|
4b6aa8 |
index 59fc440..01eec3a 100644
|
|
|
4b6aa8 |
--- a/src/plugins/Makefile.am
|
|
|
4b6aa8 |
+++ b/src/plugins/Makefile.am
|
|
|
4b6aa8 |
@@ -160,6 +160,7 @@ reporter_upload_CPPFLAGS = \
|
|
|
4b6aa8 |
-I$(srcdir)/../lib \
|
|
|
4b6aa8 |
-DBIN_DIR=\"$(bindir)\" \
|
|
|
4b6aa8 |
-DLOCALSTATEDIR='"$(localstatedir)"' \
|
|
|
4b6aa8 |
+ -DCONF_DIR=\"$(CONF_DIR)\" \
|
|
|
4b6aa8 |
-DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
|
|
|
4b6aa8 |
-DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
|
|
|
4b6aa8 |
-DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
|
|
|
4b6aa8 |
diff --git a/src/plugins/reporter-upload.c b/src/plugins/reporter-upload.c
|
|
|
4b6aa8 |
index 36509fb..7b925c8 100644
|
|
|
4b6aa8 |
--- a/src/plugins/reporter-upload.c
|
|
|
4b6aa8 |
+++ b/src/plugins/reporter-upload.c
|
|
|
4b6aa8 |
@@ -149,7 +149,7 @@ int main(int argc, char **argv)
|
|
|
4b6aa8 |
#endif
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
const char *dump_dir_name = ".";
|
|
|
4b6aa8 |
- const char *conf_file = NULL;
|
|
|
4b6aa8 |
+ const char *conf_file = CONF_DIR"/plugins/upload.conf";
|
|
|
4b6aa8 |
const char *url = NULL;
|
|
|
4b6aa8 |
const char *ssh_public_key = NULL;
|
|
|
4b6aa8 |
const char *ssh_private_key = NULL;
|
|
|
4b6aa8 |
--
|
|
|
4b6aa8 |
1.8.3.1
|
|
|
4b6aa8 |
|