kerneloops use only one config. Kerneloops.conf

merge addon-kerneloops and plugin-kerneloopsreporter into one package

6 files changed, 24 insertions, 17 deletions

diff --git a/abrt.spec b/abrt.spec
index 8f8d414f..7aa5b0dc 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -330,15 +330,10 @@ fi
 %files addon-kerneloops
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/Kerneloops.conf
-%config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsScanner.conf
 %{_bindir}/dumpoops
 %{_libdir}/%{name}/libKerneloops.so*
 %{_libdir}/%{name}/libKerneloopsScanner.so*
 %{_mandir}/man7/%{name}-KerneloopsScanner.7.gz
-
-%files plugin-kerneloopsreporter
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/%{name}/plugins/KerneloopsReporter.conf
 %{_libdir}/%{name}/libKerneloopsReporter.so*
 %{_libdir}/%{name}/KerneloopsReporter.GTKBuilder
 %{_mandir}/man7/%{name}-KerneloopsReporter.7.gz
diff --git a/lib/Plugins/Kerneloops.conf b/lib/Plugins/Kerneloops.conf
index 47b242ff..08dacd00 100644
--- a/lib/Plugins/Kerneloops.conf
+++ b/lib/Plugins/Kerneloops.conf
@@ -1,2 +1,13 @@
 # compatibility with kerneloops.org tool
 InformAllUsers = yes
+
+# KerneloopsReporter configuration. Reports kernel crashes collected by the addon.
+################################################################################
+
+# kerneloops.org
+SubmitURL = http://submit.kerneloops.org/submitoops.php
+
+# Kerneloops Scanner configuration.
+################################################################################
+
+SysLogFile = /var/log/messages
diff --git a/lib/Plugins/KerneloopsReporter.conf b/lib/Plugins/KerneloopsReporter.conf
deleted file mode 100644
index 5ec844a3..00000000
--- a/lib/Plugins/KerneloopsReporter.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# KerneloopsReporter configuration. Reports kernel crashes collected by the addon.
-################################################################################
-
-# kerneloops.org
-SubmitURL = http://submit.kerneloops.org/submitoops.php
diff --git a/lib/Plugins/KerneloopsScanner.conf b/lib/Plugins/KerneloopsScanner.conf
deleted file mode 100644
index 36aac096..00000000
--- a/lib/Plugins/KerneloopsScanner.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Kerneloops Scanner configuration.
-################################################################################
-
-SysLogFile = /var/log/messages
diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am
index 9d80d91f..97da2204 100644
--- a/lib/Plugins/Makefile.am
+++ b/lib/Plugins/Makefile.am
@@ -29,8 +29,6 @@ dist_pluginsconf_DATA = \
     SQLite3.conf \
     Logger.conf \
     Kerneloops.conf \
-    KerneloopsScanner.conf \
-    KerneloopsReporter.conf \
     Bugzilla.conf \
     Catcut.conf \
     TicketUploader.conf \
diff --git a/src/Daemon/PluginManager.cpp b/src/Daemon/PluginManager.cpp
index 2f4d8750..a75b48ba 100644
--- a/src/Daemon/PluginManager.cpp
+++ b/src/Daemon/PluginManager.cpp
@@ -205,7 +205,19 @@ void CPluginManager::RegisterPlugin(const char *pName)
             CPlugin* plugin = abrt_plugin->second->PluginNew();
             map_plugin_settings_t pluginSettings;
 
-            LoadPluginSettings(ssprintf(PLUGINS_CONF_DIR"/%s."PLUGINS_CONF_EXTENSION, pName).c_str(), pluginSettings);
+            if ((strcmp(pName, "Kerneloops") == 0)
+                || (strcmp(pName, "KerneloopsReporter") == 0)
+                || (strcmp(pName, "KerneloopsScanner") == 0)
+                )
+            {
+                LoadPluginSettings(PLUGINS_CONF_DIR"/Kerneloops."PLUGINS_CONF_EXTENSION, pluginSettings);
+                VERB3 log("Load kerneloops.conf settings");
+            }
+            else
+            {
+                LoadPluginSettings(ssprintf(PLUGINS_CONF_DIR"/%s."PLUGINS_CONF_EXTENSION, pName).c_str(), pluginSettings);
+                VERB3 log("Load %s.conf settings", pName);
+            }
             try
             {
                 plugin->Init();