summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFlorian Eckert <fe@dev.tdt.de>2019-05-14 08:17:22 +0200
committerGitHub <noreply@github.com>2019-05-14 08:17:22 +0200
commit1e206cd32dfc63233c016250f3c53f803a0c84a0 (patch)
tree6c247537ef367885625b8c8001ee6d8b460b59dd
parentbb82d4e45e0023e7f2e331446dcad901ac495f89 (diff)
parent30ee65fcab7f4bcbd9cd2f99d0e00765e0f1cb51 (diff)
Merge pull request #2514 from sandinak/feature_luci_stats_multiple_ups
luci-app-statistics: adding ability for luci_stats config to have multiple UPS's
-rw-r--r--applications/luci-app-statistics/root/etc/config/luci_statistics2
-rwxr-xr-xapplications/luci-app-statistics/root/usr/bin/stat-genconfig4
2 files changed, 3 insertions, 3 deletions
diff --git a/applications/luci-app-statistics/root/etc/config/luci_statistics b/applications/luci-app-statistics/root/etc/config/luci_statistics
index 1e841fec8..f84f67d1f 100644
--- a/applications/luci-app-statistics/root/etc/config/luci_statistics
+++ b/applications/luci-app-statistics/root/etc/config/luci_statistics
@@ -137,7 +137,7 @@ config statistics 'collectd_netlink'
config statistics 'collectd_nut'
option enable '0'
- option UPS 'myupsname'
+ list UPS 'myupsname'
config statistics 'collectd_olsrd'
option enable '0'
diff --git a/applications/luci-app-statistics/root/usr/bin/stat-genconfig b/applications/luci-app-statistics/root/usr/bin/stat-genconfig
index 7d1349b24..55cc6979e 100755
--- a/applications/luci-app-statistics/root/usr/bin/stat-genconfig
+++ b/applications/luci-app-statistics/root/usr/bin/stat-genconfig
@@ -393,9 +393,9 @@ plugins = {
network = config_network,
nut = {
- { "UPS" },
{ },
- { }
+ { },
+ { "UPS" }
},
olsrd = {