Commit Graph
1037 Commits
Author SHA1 Message Date
Hannu Nyman edc58332f0 luci-app-firewall: use maxlength datatype instead of validate function
Switch the zonename validation to use
a compound datatype "and(uciname,maxlength(14))"
instead of a separate 'validate' function.

Remove the unnecessary function that was introduced by 34e875b

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-09-17 11:02:13 +03:00
Hannu Nyman f0083abed1 statistics: fix typo
sed -i "s/collected date/collected data/"

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-09-02 15:40:56 +03:00
Hannu Nyman c0e2255ae9 Merge pull request #393 from nmav/no-group-match
luci-app-ocserv: list users with no group
2015-08-31 11:20:29 +03:00
Hannu Nyman 0d5070c510 statistics: remove references to Lucid from scripts
Both init.d and uci-defaults scripts included in luci-app-statistics
still contained stuff related to lucid, which package was removed by
https://github.com/openwrt/luci/commit/91b97bc9f625d09431dc1c753209a037d7c42fbc

Changes to scripts:
* init.d: lucid reference removed,
          /var/etc creation moved earlier (before first possible use)
* uci-defaults: lucid parameters & restart removed
  (but busybox httpd stuff was left intact, although it might be unnecessary)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-30 14:00:29 +03:00
hnyman 478bb37a45 Merge pull request #456 from hnyman/stat-config
statistics: cleanup default configuration
2015-08-30 08:57:12 +03:00
Hannu Nyman e6672f094b luci-app-multiwan: mark broken as it depends on multiwan from oldpackages
Mark luci-app-multiwan @BROKEN, as it depends on the old 'multiwan'
package, located in the deprecated 'oldpackages' feed.

'packages' feed contains both 'mwan3' and 'luci-app-mwan3' apps that
have superseded the old packages.

This should fix #395.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-29 18:04:55 +03:00
Hannu Nyman 4f429c5c8d statistics: adjust default settings to match default plugins
Adjust default settings to match the plugins installed by default
(default plugins: iwinfo, interface, load)

* disable plugins not installed by default to avoid error messages at start
* remove references to Freifunk interfaces, as most users do not have those

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-29 11:15:39 +03:00
Hannu Nyman 6a4226b3d1 statistics: cleanup config file
No functional changes, but the file is reorganised:
* group settings: general settings / output plugins / input plugins
* sort settings inside a group
* remove quotes from option names to match the current uci behaviour
* whitespace corrections

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-29 10:59:01 +03:00
Hannu Nyman 5ce647746e statistics: clarify CPU/processor graph by removing "idle" from it
Clarify the CPU time consumption graph by removing the "idle" data from it.
Especially with light traffic, removing "idle" enables the graph
to scale better and to properly show the CPU load variations.

If "idle" data needs to be seen, it might be added as a second graph below.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-28 22:58:16 +03:00
Hannu Nyman 0141494935 statistics: clarify stats introduction
* Clarify the short explanation on the statistics section's front page.
* Mention the possibility of additional collectd plugins to get more stats.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-28 22:48:03 +03:00
Hannu Nyman d820ed4882 statistics: entropy plugin - fix placement of entropy.lua
Move the file entropy.lua to the correct directory.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-28 12:51:43 +03:00
Christian Schoenebeck c48fbfa992 Merge pull request #451 from hnyman/fw-zone-len
luci-app-firewall: validate zone name to enforce fw3 max. length
2015-08-28 11:19:45 +02:00
Hannu Nyman 7df0df48c0 statistics: Add support for entropy stats
Add statistics on the available entropy.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-27 10:19:38 +03:00
Hannu Nyman 34e875b3d3 firewall: validate max length of zone name
fw3 sets the maximum length of the zone name to 14 and
ignores zone definitions with too long names.
http://nbd.name/gitweb.cgi?p=firewall3.git;a=blob;f=zones.h;hb=HEAD#l25
http://nbd.name/gitweb.cgi?p=firewall3.git;a=blob;f=zones.c;hb=HEAD#l195

Add a simple validation to ensure that the new zone name is short enough.
This should fix issue #345

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-26 13:55:26 +03:00
Christian Schoenebeck 084d435060 Merge pull request #448 from hnyman/cpulabel
statistics: cpu graph - add label definitions, add softirq and interrupt stats
2015-08-24 09:49:54 +02:00
Hannu Nyman 9a06498dbd statistics: memory plugin - improve graph by better scaling of y-axis
Utilise alt_autoscale_max to make the memory chart y-axis to scale better
for devices with e.g. 128 MB RAM.

Also fix the axis min value to 0.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-23 21:12:56 +03:00
Hannu Nyman 86ff4bd3a4 statistics: support rrdtool's alt_autoscale and alt_autoscale_max options
Implement support for alternative scaling of the y-axis.
By default, rrdtool will autoscale to 1,2,5,10,20,50,100,200,... etc.,
which is not always suitable (e.g. memory charts for device with 128 MB).

Rrdtool 1.0.50 already supports alternative autoscaling that creates
a tighter y-axis. Implement graph-level options in Luci statistics to
support those boolean options as "alt_autoscale" and "alt_autoscale_max".

info at http://oss.oetiker.ch/rrdtool/doc/rrdgraph.en.html

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-23 21:02:14 +03:00
Hannu Nyman 962cd2c4c1 statistics: cpu graph - add label definitions, add softirq and interrupt stats
CPU plugin in the Luci statistics was missing the label definitions,
so the field labels are like "cpu_system" instead of "System".
Add proper label definitions to CPU (like the other plugins already have).

The statistics graph was also missing softirq and interrupt stats, although colors
for them were defined. Softirq consumes massive amount of CPU especially with
any qos in use, so it is important for the user to see also that data. Add both
softirq and interrupt stats to the graph.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-23 17:14:22 +03:00
Srdjan Rosic 82fecb7709 Enable setting --script-security in client mode.
This is useful in client mode as well, since it allows one to use --route-noexec and --up <cmd> or --route-up <cmd> to create routes manually instead of relying on whatever routes vpn server pushes down to the client.
  mode=server dependency in luci was introduced together with script_security by mmunz back in 2011.with no explanation in the commit why mode=server was there.
2015-08-22 09:27:25 +01:00
Hannu Nyman b7b6ed740b statistics: fix ping graph label regression
Earlier update to collectd 5.4.1 changed the field from "ping" to "value",
which was changed in the graph definition here, but the label definition
was forgotten. Field's label now reads "ping_IPaddr_value".

Correct the label definition to show only IPaddr like the other two graphs.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-19 10:56:30 +03:00
Hannu Nyman ff9da6cb76 statistics: fix conntrack regression caused by collectd 5.5.0
Collectd 5.5.0 introduced new data to conntrack plugin:
In addition to the number of tracked connections there is also
the static max conntrack value and the calculated use percentage.

Luci's conntrack plugin intrepretes "conntrack-max" as a new data instance
and includes it in the graph in addition to the real "conntrack" number.

Eliminate "max" from graph by specifying empty "" instance as data source.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-18 23:05:00 +03:00
Jian Chang 966d87b79b luci-app-shadowsocks-libev: update package
support for shadowsocks-libev v2.2.3

Signed-off-by: Jian Chang <aa65535@live.com>
2015-07-23 00:52:27 +08:00
Michael Marley b1b0ba5ba9 luci-app-vnstat: Fix blank graphs for iface names with underscores
The regex used to process the iface query string argument in
vnstat.htm was stripping underscores, which caused the graph not to
display for interfaces with names containing underscores.  This
patch adds the underscore to that regex so that the interface name
will be correct and the graph will be displayed.

Signed-off-by: Michael Marley <michael@michaelmarley.com>
2015-07-12 11:45:23 -04:00
Jian Chang 74501038e4 luci-app-shadowsocks-libev: add package
This adds support for configuring shadowsocks-libev

Signed-off-by: Jian Chang <aa65535@live.com>
2015-07-03 15:17:38 +08:00
kdarbyshirebryant 387a06bb73 Delete luci-upnp
Stop sys upgrade automatically disabling miniupnpd on first boot after upgrade.
I spent a lot of time tracking this behaviour down which only occurs if you have luci-app-upnp installed.
2015-06-22 18:58:58 +01:00
Daniel Golle ba897c6a20 luci-app-olsr: depend on luci-lib-json
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2015-06-16 17:41:23 +02:00
Jo-Philipp Wich 37a9d6aee7 Merge pull request #414 from maz-1/mjpg-update
add chinese translations for luci-app-mjpg-streamer
2015-06-16 09:56:30 +02:00
Christian Schoenebeck 3429097437 Merge pull request #409 from oneru/fwknop-qr
Luci-app-fwknopd:add a couple config options to the interface
2015-06-14 12:22:48 +02:00
maz-1 8e43ab3770 add chinese translations for luci-app-mjpg-streamer 2015-06-11 10:35:21 +02:00
maz-1 0b00986cfc add chinese translations for luci-app-privoxy 2015-06-11 10:29:55 +02:00
Jonathan Bennett 9d69f61f4c Luci-app-fwknopd:add a couple config options to the interface
Minor tweaks to uci-defaults
refresh translation files
Signed-off-by: Jonathan Bennett <JBennett@incomsystems.biz>
2015-06-10 16:10:56 -05:00
Hannu Nyman 1d477abc54 luci-app-qos: remove l7 options
Cleanup luci-app-qos, as it still contains references to l7 functionality
that has been removed both from kernel and from qos-scripts.

Qos config page has a non-functional "Service" option and every visit to
qos config page generates currently an error as no l7 files can be found.
   daemon.err uhttpd[2285]: find: /etc/l7-protocols/: No such file or directory

Patch removes "Service" option and the l7 file search.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-06-06 10:41:23 +03:00
Christian Schoenebeck 22f40d392b luci-app-privoxy: fixed function ipkg_ver_compare()
fixed function ipkg_ver_compare()

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2015-06-04 20:59:21 +02:00
Christian Schoenebeck e2d6ee7822 luci-app-radicale: fixed function ipkg_ver_compare
fixed function ipkg_ver_compare()

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2015-06-04 20:50:08 +02:00
Manuel Munz 0fe4e4696e applications/splash: remove set -x from splash.sh 2015-05-31 01:13:30 +02:00
Manuel Munz 7f26be3628 applications/olsr: change config file download on olsr overview page to use seperate v4 and v6 config files 2015-05-30 22:53:11 +02:00
Manuel Munz 516ea62f73 applications/olsr: redirect errors on jsoninfo connects with netcat to /dev/null to avoid spamming the log 2015-05-30 21:04:50 +02:00
Manuel Munz cc39eaa681 applications/olsr: Get jsoninfo source port prom olsrd/olsrd6 config file 2015-05-30 20:48:57 +02:00
Jo-Philipp Wich d6d0926aee Merge pull request #388 from oneru/fwknop-qr
Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in th…
2015-05-26 17:14:24 +02:00
Christian Schoenebeck 740ce09fb9 luci-app-ddns: fixed version check
fixed version checking in function ipkg_ver_compare()
Reported issue #387 and openwrt/packages issue 1285

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2015-05-24 20:03:52 +02:00
Nikos Mavrogiannopoulos 1c57ea5d22 luci-app-ocserv: list users with no group
This was marked as "(none)" which was not caught by the regex.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
2015-05-24 16:52:32 +02:00
Jonathan Bennett 30b8097f65 Luci-app-fwknopd: Update uci-defaults as key-gen is now exposed in the fwknopd binary
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
2015-05-22 12:48:06 -05:00
Jo-Philipp Wich ec48d2d01f Merge pull request #385 from oneru/fwknop-qr
luci-app-fwknopd: Add qr code support
2015-05-20 20:26:59 +02:00
Jonathan Bennett 4ccb221f6d luci-app-fwknopd: Add qr code support
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
2015-05-20 13:02:11 -05:00
Christian Schoenebeck 754ca290e5 Merge pull request #382 from chris5560/master
luci-app-ddns: reflect changes on ddns-scripts
2015-05-14 09:02:40 +02:00
Jonathan Bennett fd130d0ce7 Add initial luci-app-fwknopd - a way to control the firewall knock daemon from luci
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
2015-05-12 21:10:00 -05:00
Christian Schoenebeck d3b6c375ce luci-app-ddns: reflect changes on ddns-scripts
* reflect updated language file for zh-cn
* change default for retry_count to 0 compatible to ddns-scripts 2.4.2-1
* addition to retry_count help description
* modified dependency on ddns-scripts 2.4.2-1

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2015-05-12 20:31:30 +02:00
Christian Schoenebeck e6804f0a93 luci-app-radicale: New app to support Radicale CalDAV/CardDAV server
New Application
!!! Dependency not set because there are two packages "radicale-py2" and
"radicale-py3" (currently BROKEN) available !!!

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2015-05-03 18:05:32 +02:00
Syrone Wong 775182ce28 luci-app-ddns: fix Simplified Chinese translations
fix typos and elegant zh_CN translations
2015-04-28 21:52:27 +08:00
郭传鈜 26b1b6d65d luci-app-ddns:Fix Simplified Chinese translation for luci-app-ddns 2015-04-24 13:34:23 +08:00