|
 |
4b6aa8 |
From ee2446d94b1355b4c5cbfce97a126e6ddc0c8241 Mon Sep 17 00:00:00 2001
|
|
|
4b6aa8 |
From: Matej Habrnal <mhabrnal@redhat.com>
|
|
|
4b6aa8 |
Date: Wed, 9 Aug 2017 16:16:51 +0200
|
|
|
4b6aa8 |
Subject: [PATCH] reporter-ureport: change default URL to FAF
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
Since internal FAF migrated from ITOS, the default
|
|
|
4b6aa8 |
URL (http://bug-report.itos.redhat.com) is deprecated.
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
Related to #1463313
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
|
|
|
4b6aa8 |
---
|
|
|
4b6aa8 |
src/plugins/report_uReport.xml.in | 2 +-
|
|
|
4b6aa8 |
src/plugins/reporter-ureport.c | 2 +-
|
|
|
4b6aa8 |
src/plugins/ureport.conf | 2 +-
|
|
|
4b6aa8 |
tests/make_description.at | 10 +++++-----
|
|
|
4b6aa8 |
4 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
diff --git a/src/plugins/report_uReport.xml.in b/src/plugins/report_uReport.xml.in
|
|
|
4b6aa8 |
index b997851..49ba8ce 100644
|
|
|
4b6aa8 |
--- a/src/plugins/report_uReport.xml.in
|
|
|
4b6aa8 |
+++ b/src/plugins/report_uReport.xml.in
|
|
|
4b6aa8 |
@@ -12,7 +12,7 @@
|
|
|
4b6aa8 |
<_label>uReport Server URL</_label>
|
|
|
4b6aa8 |
<allow-empty>no</allow-empty>
|
|
|
4b6aa8 |
<_description>Address of uReport webservice</_description>
|
|
|
4b6aa8 |
- <default-value>http://bug-report.itos.redhat.com</default-value>
|
|
|
4b6aa8 |
+ <default-value>http://bug-report.redhat.com</default-value>
|
|
|
4b6aa8 |
</option>
|
|
|
4b6aa8 |
<option type="text" name="uReport_ContactEmail">
|
|
|
4b6aa8 |
<_label>Contact email address</_label>
|
|
|
4b6aa8 |
diff --git a/src/plugins/reporter-ureport.c b/src/plugins/reporter-ureport.c
|
|
|
4b6aa8 |
index 6dcce81..8c77700 100644
|
|
|
4b6aa8 |
--- a/src/plugins/reporter-ureport.c
|
|
|
4b6aa8 |
+++ b/src/plugins/reporter-ureport.c
|
|
|
4b6aa8 |
@@ -22,7 +22,7 @@
|
|
|
4b6aa8 |
#include "ureport.h"
|
|
|
4b6aa8 |
#include "libreport_curl.h"
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
-#define DEFAULT_WEB_SERVICE_URL "http://bug-report.itos.redhat.com"
|
|
|
4b6aa8 |
+#define DEFAULT_WEB_SERVICE_URL "http://bug-report.redhat.com"
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
int main(int argc, char **argv)
|
|
|
4b6aa8 |
{
|
|
|
4b6aa8 |
diff --git a/src/plugins/ureport.conf b/src/plugins/ureport.conf
|
|
|
4b6aa8 |
index 2256a7f..7037010 100644
|
|
|
4b6aa8 |
--- a/src/plugins/ureport.conf
|
|
|
4b6aa8 |
+++ b/src/plugins/ureport.conf
|
|
|
4b6aa8 |
@@ -1,5 +1,5 @@
|
|
|
4b6aa8 |
# Base URL to uReport server
|
|
|
4b6aa8 |
-# URL = http://bug-report.itos.redhat.com
|
|
|
4b6aa8 |
+# URL = http://bug-report.redhat.com
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
# no means that ssl certificates will not be checked
|
|
|
4b6aa8 |
# SSLVerify = no
|
|
|
4b6aa8 |
diff --git a/tests/make_description.at b/tests/make_description.at
|
|
|
4b6aa8 |
index e606065..358be30 100644
|
|
|
4b6aa8 |
--- a/tests/make_description.at
|
|
|
4b6aa8 |
+++ b/tests/make_description.at
|
|
|
4b6aa8 |
@@ -47,14 +47,14 @@ int main(int argc, char **argv)
|
|
|
4b6aa8 |
"Bugzilla: URL=https://bugzilla.redhat.com/1000000\n"
|
|
|
4b6aa8 |
"ABRT Server: BTHASH=81680083BIGBOOBS\n"
|
|
|
4b6aa8 |
"RHTSupport: TIME=12345678 URL=https://access.redhat.com/home MSG=The world's best IT support\n"
|
|
|
4b6aa8 |
- "ABRT Server: URL=https://bug-report.itos.redhat.com\n");
|
|
|
4b6aa8 |
+ "ABRT Server: URL=https://bug-report.redhat.com\n");
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
description = make_description(pd, /*skipped names*/NULL, CD_MAX_TEXT_SIZE, MAKEDESC_SHOW_URLS);
|
|
|
4b6aa8 |
expected = xasprintf(
|
|
|
4b6aa8 |
/*0123456789ABCDEF*/
|
|
|
4b6aa8 |
"Reported: https://bugzilla.redhat.com/1000000\n"
|
|
|
4b6aa8 |
" https://access.redhat.com/home\n"
|
|
|
4b6aa8 |
- " https://bug-report.itos.redhat.com\n");
|
|
|
4b6aa8 |
+ " https://bug-report.redhat.com\n");
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
if (strcmp(expected, description) != 0)
|
|
|
4b6aa8 |
{
|
|
|
4b6aa8 |
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
|
|
|
4b6aa8 |
"Bugzilla: URL=https://bugzilla.redhat.com/1000000\n"
|
|
|
4b6aa8 |
"ABRT Server: BTHASH=81680083BIGBOOBS\n"
|
|
|
4b6aa8 |
"RHTSupport: TIME=12345678 URL=https://access.redhat.com/home MSG=The world's best IT support\n"
|
|
|
4b6aa8 |
- "ABRT Server: URL=https://bug-report.itos.redhat.com\n");
|
|
|
4b6aa8 |
+ "ABRT Server: URL=https://bug-report.redhat.com\n");
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
description = make_description(pd, /*skipped names*/NULL, CD_MAX_TEXT_SIZE, MAKEDESC_SHOW_ONLY_LIST | MAKEDESC_SHOW_URLS);
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
|
|
|
4b6aa8 |
/*0123456789ABCDEF*/
|
|
|
4b6aa8 |
"Reported: https://bugzilla.redhat.com/1000000\n"
|
|
|
4b6aa8 |
" https://access.redhat.com/home\n"
|
|
|
4b6aa8 |
- " https://bug-report.itos.redhat.com\n",
|
|
|
4b6aa8 |
+ " https://bug-report.redhat.com\n",
|
|
|
4b6aa8 |
FILENAME_REASON, 14 - strlen(FILENAME_REASON), "", "will_segfault killed by SIGSEGV",
|
|
|
4b6aa8 |
FILENAME_PACKAGE, 14 - strlen(FILENAME_PACKAGE), "", "libreport",
|
|
|
4b6aa8 |
FILENAME_COUNT, 14 - strlen(FILENAME_COUNT), "", "0");
|
|
|
4b6aa8 |
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
|
|
|
4b6aa8 |
/*0123456789ABCDEF*/
|
|
|
4b6aa8 |
"Reported: https://bugzilla.redhat.com/1000000\n"
|
|
|
4b6aa8 |
" https://access.redhat.com/home\n"
|
|
|
4b6aa8 |
- " https://bug-report.itos.redhat.com\n"
|
|
|
4b6aa8 |
+ " https://bug-report.redhat.com\n"
|
|
|
4b6aa8 |
"\n"
|
|
|
4b6aa8 |
"%s: %*sText file, %llu bytes\n"
|
|
|
4b6aa8 |
"%s: %*sText file, %llu bytes\n",
|
|
|
4b6aa8 |
--
|
|
|
4b6aa8 |
1.8.3.1
|
|
|
4b6aa8 |
|