Move all possible base config nodes to default.conf

Change-Id: Ic724a8ed85d519420bcb7cfe500dc2538ed78cee

diff --git a/config/10-example-noop.conf b/config/10-example-noop.conf
deleted file mode 100644 (file)
index fc0a80b..0000000
--- a/config/10-example-noop.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "global":{
-    },
-
-
-    "foreground_native_app":{
-    },
-
-    "background_native_app":{
-    },
-
-
-    "foreground_web_app":{
-    },
-
-    "background_web_app":{
-    },
-
-
-    "foreground_csharp_app":{
-    },
-
-    "background_csharp_app":{
-    },
-
-
-    "foreground_ui_widget":{
-    },
-
-    "background_ui_widget":{
-    },
-
-
-    "native_service":{
-    },
-
-    "other_service":{
-    },
-}

diff --git a/config/default.conf b/config/default.conf
index b67e7e0..7201d71 100644 (file)
--- a/config/default.conf
+++ b/config/default.conf
@@ -21,6 +21,42 @@
         "fd_limit": 1000,
     },
 
+
+    "foreground_native_app":{
+    },
+
+    "background_native_app":{
+    },
+
+
+    "foreground_web_app":{
+    },
+
+    "background_web_app":{
+    },
+
+
+    "foreground_csharp_app":{
+    },
+
+    "background_csharp_app":{
+    },
+
+
+    "foreground_ui_widget":{
+    },
+
+    "background_ui_widget":{
+    },
+
+
+    "native_service":{
+    },
+
+    "other_service":{
+    },
+
+
     "stability-monitor":{
         "monitor": 0,
     },

diff --git a/packaging/stability-monitor.spec b/packaging/stability-monitor.spec
index d14811c..6d4e59f 100644 (file)
--- a/packaging/stability-monitor.spec
+++ b/packaging/stability-monitor.spec
@@ -39,7 +39,6 @@ make -C tests all
 %install
 make install INSTALL_PREFIX=%{buildroot}/%{_sbindir}
 install -D config/default.conf %{buildroot}/%{_libdir}/stability-monitor/default.conf
-install -D config/10-example-noop.conf %{buildroot}/%{_sysconfdir}/stability-monitor.d/10-example-noop.conf
 
 install -D config/stability-monitor.service %{buildroot}/%{_unitdir}/stability-monitor.service
 mkdir -p %{buildroot}/%{_unitdir}/multi-user.target.wants
@@ -58,7 +57,6 @@ install -D tests/config.json          %{buildroot}/etc/stability-monitor.d/99-te
 %license COPYING
 %{_sbindir}/stability-monitor
 %{_libdir}/stability-monitor/default.conf
-%{_sysconfdir}/stability-monitor.d/10-example-noop.conf
 %{_unitdir}/stability-monitor.service
 %{_unitdir}/multi-user.target.wants/stability-monitor.service