move ccpp related events to events.d/

- so now when the abrt-addon-ccpp is removed it's config will be removed
  with it, so the rest of abrt and libreport won't be confused

5 files changed, 29 insertions, 16 deletions

diff --git a/abrt.spec b/abrt.spec
index ab926d1e..a0b12a99 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -387,6 +387,7 @@ fi
 %dir %attr(0775, abrt, abrt) %{_localstatedir}/run/%{name}
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/plugins
+%dir %{_sysconfdir}/%{name}/events.d
 %dir %{_libdir}/%{name}
 %{_mandir}/man8/abrtd.8.gz
 %{_mandir}/man5/%{name}.conf.5.gz
@@ -452,6 +453,7 @@ fi
 %{_bindir}/abrt-action-analyze-c
 %{_bindir}/abrt-action-install-debuginfo.py*
 %{_bindir}/abrt-action-generate-backtrace
+%{_sysconfdir}/%{name}/events.d/ccpp_events.conf
 
 %files addon-kerneloops
 %defattr(-,root,root,-)
diff --git a/configure.ac b/configure.ac
index 0f94653d..5ca28a99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,7 @@ AC_CHECK_HEADER([sys/inotify.h], [],
 CONF_DIR='${sysconfdir}/${PACKAGE_NAME}'
 VAR_RUN='${localstatedir}/run'
 PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins'
+EVENTS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/events.d'
 PLUGINS_LIB_DIR='${libdir}/${PACKAGE_NAME}'
 ENABLE_SOCKET_OR_DBUS='-DENABLE_DBUS=1'
 LIBEXEC_DIR='${libexecdir}'
@@ -102,6 +103,7 @@ AC_SUBST(ENABLE_SOCKET_OR_DBUS)
 AC_SUBST(CONF_DIR)
 AC_SUBST(VAR_RUN)
 AC_SUBST(PLUGINS_CONF_DIR)
+AC_SUBST(EVENTS_CONF_DIR)
 AC_SUBST(PLUGINS_LIB_DIR)
 AC_SUBST(DEBUG_DUMPS_DIR)
 AC_SUBST(DEBUG_INFO_DIR)
diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf
index 34aba290..23765718 100644
--- a/src/daemon/abrt_event.conf
+++ b/src/daemon/abrt_event.conf
@@ -16,6 +16,9 @@
 # Rule of the form "include GLOB_PATTERN" recurses to each file which matches
 # GLOB_PATTERN. Example: "include post-create.d/*.conf"
 #
+
+include events.d/*.conf
+
 # Any other rules specify which programs to run on the crash dump.
 #
 # Each rule may have conditions to be checked before the program is run.
@@ -41,7 +44,6 @@
 
 # abrt-action-analyze-c needs package name, save package data first
 EVENT=post-create                       abrt-action-save-package-data
-EVENT=post-create analyzer=CCpp         abrt-action-analyze-c
 EVENT=post-create analyzer=Python       abrt-action-analyze-python
 EVENT=post-create analyzer=Kerneloops   abrt-action-analyze-oops
 # If you want all users (not just root) to be able to see oopses:
@@ -66,21 +68,6 @@ EVENT=post-create analyzer=Kerneloops   abrt-action-analyze-oops
                 true
         } 2>/dev/null
 
-#TODO: implement this (or add this functionality to abrt-action-install-debuginfo):
-#EVENT=analyze analyzer=CCpp backtrace=     trim-debuginfo-cache /var/cache/abrt-di 4096m
-
-#TODO: can we still specify additional directories to search for debuginfos,
-# or was this ability lost with move to python installer?
-EVENT=analyze analyzer=CCpp backtrace=     abrt-action-install-debuginfo --core="$DUMP_DIR/coredump"
-EVENT=analyze analyzer=CCpp backtrace=     abrt-action-generate-backtrace
-
-# Same as "analyze", but executed when user requests "refresh" in GUI
-#EVENT=reanalyze analyzer=CCpp  trim-debuginfo-cache /var/cache/abrt-di 4096m
-EVENT=reanalyze analyzer=CCpp  abrt-action-install-debuginfo --core="$DUMP_DIR/coredump"
-EVENT=reanalyze analyzer=CCpp  abrt-action-generate-backtrace
-
 EVENT=report          analyzer=Kerneloops  abrt-action-kerneloops
-EVENT=report_Bugzilla analyzer=CCpp        abrt-action-bugzilla -c /etc/abrt/plugins/Bugzilla.conf
-EVENT=report_Logger   analyzer=CCpp        abrt-action-print -o /var/log/abrt.log
 EVENT=report_Bugzilla analyzer=Python      abrt-action-bugzilla -c /etc/abrt/plugins/Bugzilla.conf
 EVENT=report_Logger   analyzer=Python      abrt-action-print -o /var/log/abrt.log
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 938f88ba..c6451c83 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -37,6 +37,11 @@ dist_pluginsconf_DATA = \
     RHTSupport.conf \
     Upload.conf
 
+eventsconfdir = $(EVENTS_CONF_DIR)
+
+dist_eventsconf_DATA = \
+    ccpp_events.conf
+
 man_MANS = \
     abrt-Bugzilla.7 \
     abrt-KerneloopsReporter.7 \
diff --git a/src/plugins/ccpp_events.conf b/src/plugins/ccpp_events.conf
new file mode 100644
index 00000000..1ad57608
--- /dev/null
+++ b/src/plugins/ccpp_events.conf
@@ -0,0 +1,17 @@
+EVENT=post-create analyzer=CCpp         abrt-action-analyze-c
+
+#TODO: implement this (or add this functionality to abrt-action-install-debuginfo):
+#EVENT=analyze analyzer=CCpp backtrace=     trim-debuginfo-cache /var/cache/abrt-di 4096m
+
+#TODO: can we still specify additional directories to search for debuginfos,
+# or was this ability lost with move to python installer?
+EVENT=analyze analyzer=CCpp backtrace=     abrt-action-install-debuginfo --core="$DUMP_DIR/coredump"
+EVENT=analyze analyzer=CCpp backtrace=     abrt-action-generate-backtrace
+
+# Same as "analyze", but executed when user requests "refresh" in GUI
+#EVENT=reanalyze analyzer=CCpp  trim-debuginfo-cache /var/cache/abrt-di 4096m
+EVENT=reanalyze analyzer=CCpp  abrt-action-install-debuginfo --core="$DUMP_DIR/coredump"
+EVENT=reanalyze analyzer=CCpp  abrt-action-generate-backtrace
+
+EVENT=report_Bugzilla analyzer=CCpp        abrt-action-bugzilla -c /etc/abrt/plugins/Bugzilla.conf
+EVENT=report_Logger   analyzer=CCpp        abrt-action-print -o /var/log/abrt.log