added xml file for kerneloops reporter, split koops events to a separate file

5 files changed, 30 insertions, 10 deletions

diff --git a/abrt.spec b/abrt.spec
index 2b0e26a6..3a6c470c 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -496,6 +496,8 @@ fi
 %files addon-kerneloops
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Kerneloops.conf
+%{_sysconfdir}/%{name}/events/report_Kerneloops.xml
+%{_sysconfdir}/%{name}/events.d/koops_events.conf
 %{_mandir}/man7/abrt-KerneloopsReporter.7.gz
 %{_bindir}/abrt-dump-oops
 %{_bindir}/abrt-action-analyze-oops
diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf
index 129e532a..35f6fb0a 100644
--- a/src/daemon/abrt_event.conf
+++ b/src/daemon/abrt_event.conf
@@ -53,13 +53,6 @@ include events.d/*.conf
 # In this case, do not record username too:
 EVENT=post-create                       if [ -f uid ]; then getent passwd "`cat uid`" | cut -d: -f1 >username; fi
 EVENT=post-create analyzer=Python       abrt-action-analyze-python
-EVENT=post-create analyzer=Kerneloops   abrt-action-analyze-oops
-
-# If you want behavior similar to one provided by kerneloops daemon
-# distributed by kerneloops.org - that is, if you want
-# oopses to be reported automatically and immediately without
-# user interaction, uncomment this line:
-#EVENT=post-create analyzer=Kerneloops  abrt-action-kerneloops
 
 # Example: if you want to save sosreport immediately at the moment of a crash:
 # (alternatively, you can add similar command to EVENT=analyze_foo's,
@@ -79,6 +72,5 @@ EVENT=post-create analyzer=Kerneloops   abrt-action-analyze-oops
         } 2>/dev/null
 
 
-EVENT=report_kerneloops.org analyzer=Kerneloops abrt-action-kerneloops
 EVENT=report_Bugzilla analyzer=Python           abrt-action-bugzilla -c /etc/abrt/plugins/Bugzilla.conf
 EVENT=report_Logger                             abrt-action-print -o "${Log_File:-/tmp/abrt.log}" -a "${Append:-no}"
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 942ceac4..959306ef 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -37,13 +37,15 @@ dist_events_DATA = \
     analyze_LocalGDB.xml \
     analyze_RetraceServer.xml \
     report_Mailx.xml \
-    report_RHTSupport.xml
+    report_RHTSupport.xml \
+    report_Kerneloops.xml
 
 eventsconfdir = $(EVENTS_CONF_DIR)
 
 dist_eventsconf_DATA = \
     ccpp_events.conf \
-    mailx_events.conf
+    mailx_events.conf \
+    koops_events.conf
 
 man_MANS = \
     abrt-Bugzilla.7 \
diff --git a/src/plugins/koops_events.conf b/src/plugins/koops_events.conf
new file mode 100644
index 00000000..093bd086
--- /dev/null
+++ b/src/plugins/koops_events.conf
@@ -0,0 +1,11 @@
+# analyze
+EVENT=post-create analyzer=Kerneloops   abrt-action-analyze-oops
+
+# If you want behavior similar to one provided by kerneloops daemon
+# distributed by kerneloops.org - that is, if you want
+# oopses to be reported automatically and immediately without
+# user interaction, uncomment this line:
+#EVENT=post-create analyzer=Kerneloops  abrt-action-kerneloops
+
+# report
+EVENT=report_Kerneloops analyzer=Kerneloops abrt-action-kerneloops
diff --git a/src/plugins/report_Kerneloops.xml b/src/plugins/report_Kerneloops.xml
new file mode 100644
index 00000000..bafe34d6
--- /dev/null
+++ b/src/plugins/report_Kerneloops.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<event>
+    <name>Kerneloops.org</name>
+    <description>Send kernel problems to oops tracker</description>
+    <options>
+        <option type="text" name="KerneloopsReporter_SubmitURL">
+            <label>Kerneloops URL</label>
+            <allow-empty>no</allow-empty>
+            <description>Oops server url</description>
+            <default-value>http://submit.kerneloops.org/submitoops.php</default-value>
+        </option>
+    </options>
+</event>