Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

6 files changed, 37 insertions, 2 deletions

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 040ade1f..352c23af 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -409,3 +409,8 @@ abrt_retrace_client_SOURCES = \
      $(NSS_LIBS)
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+
+if HAVE_SYSTEMD
+dist_systemdsystemunit_DATA = \
+    abrt-oops.service
+endif
diff --git a/src/plugins/abrt-oops.service b/src/plugins/abrt-oops.service
new file mode 100644
index 00000000..4911e2ba
--- /dev/null
+++ b/src/plugins/abrt-oops.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=ABRT kernel log watcher
+After=syslog.target
+
+[Service]
+ExecStart=/usr/bin/abrt-dump-oops -d /var/spool/abrt -rwx /var/log/messages
+
+[Install]
+WantedBy=multi-user.target
diff --git a/src/plugins/report_Bugzilla.xml.in b/src/plugins/report_Bugzilla.xml.in
index d12521d8..00ef4a49 100644
--- a/src/plugins/report_Bugzilla.xml.in
+++ b/src/plugins/report_Bugzilla.xml.in
@@ -3,8 +3,8 @@
     <_name>Bugzilla</_name>
     <_description>Report to Bugzilla bug tracker</_description>
 
-    <requires-items></requires-items>
-    <exclude-items-by-default></exclude-items-by-default>
+    <requires-items>component,duphash,os_release</requires-items>
+    <exclude-items-by-default>coredump,count,event_log,reported_to</exclude-items-by-default>
     <exclude-items-always></exclude-items-always>
     <exclude-binary-items>yes</exclude-binary-items>
     <include-items-by-default></include-items-by-default>
diff --git a/src/plugins/report_Kerneloops.xml.in b/src/plugins/report_Kerneloops.xml.in
index 83ea50b5..a4da6b6b 100644
--- a/src/plugins/report_Kerneloops.xml.in
+++ b/src/plugins/report_Kerneloops.xml.in
@@ -2,6 +2,13 @@
 <event>
     <_name>Kerneloops.org</_name>
     <_description>Send kernel problems to oops tracker</_description>
+
+    <requires-items>backtrace</requires-items>
+    <exclude-items-by-default></exclude-items-by-default>
+    <exclude-items-always>*</exclude-items-always>
+    <exclude-binary-items>yes</exclude-binary-items>
+    <include-items-by-default></include-items-by-default>
+
     <options>
         <option type="text" name="KerneloopsReporter_SubmitURL">
             <_label>Kerneloops URL</_label>
diff --git a/src/plugins/report_Mailx.xml.in b/src/plugins/report_Mailx.xml.in
index 7584af7d..2476a3d5 100644
--- a/src/plugins/report_Mailx.xml.in
+++ b/src/plugins/report_Mailx.xml.in
@@ -2,6 +2,13 @@
 <event>
     <_name>Mailx</_name>
     <_description>Send via email</_description>
+
+    <requires-items></requires-items>
+    <exclude-items-by-default>coredump</exclude-items-by-default>
+    <exclude-items-always></exclude-items-always>
+    <exclude-binary-items>no</exclude-binary-items>
+    <include-items-by-default></include-items-by-default>
+
     <options>
         <option type="text" name="Mailx_Subject">
             <_label>Subject</_label>
diff --git a/src/plugins/report_RHTSupport.xml.in b/src/plugins/report_RHTSupport.xml.in
index 725be3ac..834528ae 100644
--- a/src/plugins/report_RHTSupport.xml.in
+++ b/src/plugins/report_RHTSupport.xml.in
@@ -2,6 +2,13 @@
 <event>
     <_name>Red Hat Customer Support</_name>
     <_description>Report to Red Hat support</_description>
+
+    <requires-items>package</requires-items>
+    <exclude-items-by-default>event_log,reported_to</exclude-items-by-default>
+    <exclude-items-always></exclude-items-always>
+    <exclude-binary-items>no</exclude-binary-items>
+    <include-items-by-default></include-items-by-default>
+
     <options>
         <option type="text" name="RHTSupport_URL">
             <_label>RH Portal URL</_label>