Commit graph

8369 commits

Author SHA1 Message Date
Hannu Nyman
92c78f3e80 luci-app-statistics: processes: fix graph visibility
Fix graph visibility on processes page based on plugin
instance. The overview instance is empty, while monitored
processes have their own instances.

Original version of the patch created by @koblack and
discussed in #1021

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 0a6ce20423)
2017-05-09 09:54:14 +03:00
Hannu Nyman
97ad2a9286 luci-mod-admin-full: add advice to restart cron
Cron init script starts the service only if a crontab file
exists. If there is no crontab file at boot and the user
later creates one, he needs to manually restart the service.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 1970c21e3b)
2017-05-08 16:06:06 +03:00
Jo-Philipp Wich
596f47649c luci-base: luci.dispatcher: allow overriding sysauth template
In some cases it is useful to be able to override the template used for the
sysauth login dialog.

Add a new property "sysauth_template" which allows overriding the template
name from controller files.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-05-06 15:07:57 +02:00
Hannu Nyman
63d61d726c luci-app-statistics: fix whitespace
* fix whitespace in config file
* place the contextswitch item corerrctly
  in the sorted options list

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 2bc2f935a0)
2017-05-02 10:12:40 +03:00
Hannu Nyman
9686fd1cc4 luci-app-statistics: processes plugin: add labels, correct data
Enhance processes statistics page:
* add proper labels to graphs
* correct RSS memory stats title, add VSZ stats

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b737831e56)
2017-04-30 19:07:38 +03:00
Hannu Nyman
e3bd7b5ee0 luci.mk: fix length of abbreviated hash in version
Fix the length of the abbreviated commit hash used in
the LuCI version string used in the package names.
Use the old standard of seven characters in hash.

New git versions vary the length of the abbreviated
commit hash based on the number of objects in repo. That
may lead into different hash lengths with e.g. having
full/shallow git history, having all/single branch or
having different git versions in different build hosts.

Different hash lengths in package name may lead to
sneaky opkg install errors, as opkg apparently preserves
info for removed packages and may prefer that.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b9159c5347)
2017-04-30 11:48:05 +03:00
Hannu Nyman
71f669b3bd luci-app-statistics: remove non-functional links from graphs
The statistics graphs on the pages with multiple data sources
have contained links to the data sources, but those links
have not worked. Remove the links as they are unnecessary.

This commit fixes #1006

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

(cherry picked from commit 298f838d39)
2017-04-30 11:11:18 +03:00
Hannu Nyman
ae565bc393 luci-app-adblock: backport updates to match 2.6.2
Backport updates to luci-app-adblock that correspond to
the adblock 2.6.2 version.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-04-30 00:09:39 +03:00
fantom-x
7fee975bb4 Support for collectd-mod-contextswitch
Signed-off-by: Marc Benoit marcb6218@gmail.com
(cherry picked from commit 5bf636732e)
2017-04-29 23:42:22 +03:00
Jo-Philipp Wich
16ffea4bf5 luci-mod-admin-full: use nf_conntrack_count for counting connections (#1114)
As suggested by PR #1114, use `/proc/sys/net/netfilter/nf_conntrack_count`
instead of counting the lines in `/proc/net/nf_conntrack` but use a slightly
more efficient approach which avoids spawning an extra `cat` command.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-04-20 16:57:58 +02:00
Hannu Nyman
29fabe2639 timezone data: update to 2017b
Update timezone data to 2017b.

http://mm.icann.org/pipermail/tz-announce/2017-February/000045.html
http://mm.icann.org/pipermail/tz-announce/2017-March/000046.html

Key changes in 2017a-2017b:

* Mongolia no longer observes DST.
* Chile's Region of Magallanes moves from -04/-03 to -03 year-round.
* Switch to numeric time zone abbreviations for South America, as
  part of the ongoing project of removing invented abbreviations.
* Haiti resumed observance of DST in 2017.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 54c97738bc)
2017-04-10 22:36:11 +03:00
Jo-Philipp Wich
b47a21fbbb luci-app-firewall: adjust drop_invalid default (#1068)
Since firewall3 commit b33f78371e7c7b6a131c2b6c01673cbd4b3c13d1 the
drop_invalid option is off by default.

Adjust LuCI view to properly handle the changed semantics.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-03-14 12:53:45 +01:00
Hannu Nyman
a5191efc7c i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-03-04 18:24:26 +02:00
Hannu Nyman
0d555e5cdf Merge pull request #1050 from luizluca/17.01/pt-br-translation
i18n: complete pt-br translation
2017-03-03 22:05:23 +02:00
Luiz Angelo Daros de Luca
de29b38cce i18n: complete pt-br translation
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
(partial cherry pick from commit fe9d39c06c)
2017-03-03 15:14:54 -03:00
Hannu Nyman
2fe510bceb Merge pull request #1041 from EricLuehrsen/unbound_17_01
[lede-17.01] luci-app-unbound: service updates coordinated with application package
2017-03-02 14:37:31 +02:00
Hannu Nyman
4d8b1352bf luci-mod-admin-full: new hostapd functionality for 80211w/r detection
Use the new hostapd functionality (in LEDE) to detect 802.11r and 802.11w
more properly. Leave the old logic in place for Openwrt.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(partial cherry pick from commit b0943391d8)
2017-03-01 10:20:30 +02:00
Hannu Nyman
5be88e0c3e luci-mod-admin-full: adjust 80211w option default value
Adjust 802.11w default value from "0" to "" in order to avoid unnecessary
"option ieee80211w 0" lines in /etc/config/wireless

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(partial cherry pick from commit b0943391d8)
2017-02-28 16:34:49 +02:00
Hannu Nyman
12f98db8ba luci-base: backport cbi datatype changes
Backport the new cbi datatypes and whitespace fixes from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-02-28 16:22:52 +02:00
Eric Luehrsen
e882e0d730 unbound: add uci-default script
Also if unbound-control is installed, then configure so
luci-app-commands can quickly show the "local zones" and
"local data" (aka hosts). This helps diagnose DHCP-DNS
zone data and adblock zone data.

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2017-02-25 15:44:36 -05:00
Eric Luehrsen
d29e395262 unbound: update UCI for odhcpd and hostname
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2017-02-25 15:44:36 -05:00
Cody R. Brown
a100738163 mod-admin-full: Add IPv6 Prefix Delegation information to Status Pages
The Overview page and Network>Interfaces page currently do not give much
information about IPv6, particularly with Prefix Delegated setups. In these
setups, ISP will delegate a prefix to the router. Currently LuCI doesn't display
this Prefix Delegation from the ISP anywhere. A number of changes was added
to this commit:

1) self:_ubus("ipv6-prefix") was extracted and put into protocol.ip6prefix.
2) Network>Interfaces page, if a .ip6prefix is present, show it under Status.
   (IPv6-PD).
3) On the Overview page, "Type" and "Prefix Delegated" has been added to
  the IPv6 Network Overview Status:
  - Type will display the .proto, similar to the IPv4 case.
    If a .ip6prefix is present, it'll display a "-pd" at the end of
    the Type: i.e. dhcpv6-pd vs. dhcpv6.
  - If no .ip6prefix is present, it'll do what it does currently, and
    just show Address, or :: if no address is present.
  - If .ip6prefix is present, it'll show the "Prefix Delegated", it'll also
    hide "Address" if no address is present, else it'll show ifc6.ip6addr as well.

Signed-off-by: Cody R. Brown <dev@codybrown.ca>
(cherry picked from commit 5377d22b4a)
(commit message reformatted)
2017-02-20 16:48:19 +02:00
Eric Luehrsen
6c09d83406 luci: ignore '::1' in realtime connections
luci ignores only 127.0.0.1 in real time connections.
The dnsmasq.init script sets up resolv.conf(s) as such.
With alternate DNS servers configured 'localhost' will
resolve to '127.0.0.1' or '::1'. The connections graph
will spam itself. openwrt/luci#996

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
(cherry picked from commit 52771816a0)
2017-02-20 16:47:56 +02:00
Jo-Philipp Wich
a57a17ad8a luci.mk: only use remote branch detection
LEDE's scripts/feeds script creates local branches named after the checked
out commit hash, confusing local branch detection.

Solely use remote branch detection to avoid misidentifying such cases.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-02-20 14:35:54 +01:00
Jo-Philipp Wich
79992f1a67 luci.mk: fix branch detection in detached HEAD state
When LuCI is checked out via pinned feeds configuration, its source tree will
end up in detached head state, requiring some more magic to figure out the
proper branch.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-02-20 14:16:26 +01:00
Hannu Nyman
f535090ffc i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-02-16 14:49:25 +02:00
Hannu Nyman
a76564d973 luci-mod-admin-full: change html for compatibility with openwrt theme
Openwrt theme apparently accepts slightly different html than
Bootstrap or Material. Change code to <br /> to make it compatible.

This fixes #1011

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 6a2a62fa4f)
2017-02-15 08:54:59 +02:00
Hannu Nyman
7e6b3d1eb9 luci-mod-admin-full: place 80211w options behind a check for wpad-full
The default hostapd/wpad mini version does not support ieee80211w
and the option's visibility in LuCI may lead it to be placed in user's
/etc/config/wireless preventing wifi from starting.

Check for hostapd/wpad full before exposing the option.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 07e01d094e)
2017-02-14 23:43:05 +02:00
Hannu Nyman
3613236505 Merge pull request #998 from hnyman/backport-80211r-80211w
Backport 802.11r and 802.11w LuCI support to lede-17.01
2017-02-14 14:23:40 +02:00
Hannu Nyman
d1d3b8612e Backport: support for 802.11w Management Frame Protection
Add support for IEEE802.11w Management Frame Protection options
into the wireless config.

Mention in the help text that the full version of wpad/hostapd is
needed.

Currently supported in LEDE by ath9k and ath10k, mwlwifi and mt76.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

(cherry picked from commit 4ddb6b2816)
(cherry picked from commit 4d31f7ca30)
2017-02-10 17:21:47 +02:00
Hannu Nyman
8dec864828 Backport: support for 802.11r fast transition in wireless config
Backports from master the commits that add support for
IEEE802.11r Fast Transition to luci.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

(cherry picked from commit f02794f28c)
(cherry picked from commit 171c06146a)
(cherry picked from commit 02bed26188)
(cherry picked from commit c491c181ea)
2017-02-10 17:14:48 +02:00
Hannu Nyman
5e7b188ecb luci-base: add hexstring datatype
Add datatype 'hexstring' for input validaiton datatypes.

It will accept any hexadecimal string.

(no length validation, as rangelength can be used for that.)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 11f23559e4)
2017-02-10 17:12:57 +02:00
Daniel Dickinson
1f014bd218 Merge pull request #957 from musashino205/17-dynpnt-add-ja
luci-app-dynapoint: Add Japanese translation
2017-02-07 16:04:20 -05:00
Dirk Brenken
d5734c5abd luci-app-adblock: put backup options to global section
this PR reflect the changes made in adblock 2.3.0

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit d3a74836b7)
2017-02-07 19:22:24 +02:00
Hannu Nyman
e306ee6c93 luci-ssl-openssl: use OpenSSL for key generation, drop px5g
Replace a dependency for px5g with openssl-util. Both LEDE and
Openwrt have now uhttpd versions that can generate keys with
OpenSSL cmd tools if px5g is not found. This change enables an
"OpenSSL-only" version of LuCI without mbedTLS/PolarSSL.

(Note: if px5g is found, uhttpd will prefer that.)

Relevant commits in uhttpd:

LEDE:
3c4858eeb2
82132540a3
9097dc5ad8

Openwrt:
6ec32832d2

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b6341bd197)
2017-02-02 08:41:25 +02:00
Jo-Philipp Wich
5f80115b2c luci-mod-admin-full: fixes for usbport LED triggers
The previous commit erroneously used "ports" instead of "port" as name for the
option widget, causing wrong uci values to be written.

Also work around some cbi idiosyncrasies regarding MultiValue widgets which
prevented rendering the correct initial selection state.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-02-02 00:40:43 +01:00
Jo-Philipp Wich
46fd88ec6c luci-base: fix logic errors in ipmask4 and ipmask6 datatype validators
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-30 19:14:54 +01:00
Jo-Philipp Wich
472dc4b9e2 luci-mod-admin-full: admin: change password in Map.parse()
Move the password setting into the .parse() callback to ensure that it is
updated regardless of whether "Save" or "Save & Apply" has been pressed.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-26 00:39:38 +01:00
Jo-Philipp Wich
af2c7d9ebe luci-mod-admin-full: support configuring usbport LED triggers
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-26 00:39:38 +01:00
Jo-Philipp Wich
0a6507d760 luci-base: mvalue: fix column wrapping
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-26 00:39:38 +01:00
Jo-Philipp Wich
6e412cc78c luci-mod-admin-full: reload wifi settings page after changing countey code
Reloading the page ensures that the allowed tx power values and channel select
lists are properly populated with the new effective values.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-26 00:39:38 +01:00
Rafał Miłecki
1cd096d291 luci-mod-admin-full: allow unset txpower value
Sometimes txpower is not set so we should have an option with empty
value to let it stay unset.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2017-01-26 00:39:38 +01:00
Jo-Philipp Wich
7cd9ecff00 luci-base: datatypes.lua: add missing parentheses in conditional
The missing parens lead to a wrong expression precedence, causing a runtime
error when attempting to compare nil with a number.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-24 13:52:12 +01:00
Jo-Philipp Wich
33a917f9c4 luci-app-firewall: use new ipmask validation types when applicable
This allows for address specifications like "fdca🔢0123::abcd/::ffff:ffff:ffff:ffff"
which only match the last 64 bits of an address. This syntax is legal and already supported
by iptables and firewall3.

Fixes https://bugs.lede-project.org/index.php?do=details&task_id=417

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-23 16:19:26 +01:00
Jo-Philipp Wich
8297be5485 luci-base: add ipmask, ipmask4 and ipmask6 validators
These validators accept IP address specifications in the form

 - address
 - address/bits
 - address/netmask

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-23 16:19:23 +01:00
Jo-Philipp Wich
07ceede1be luci-base: datatypes.lua: cleanup white space
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-23 16:18:56 +01:00
INAGAKI Hiroshi
7d1f875c25 luci-app-dynapoint: Add Japanese translation
Added Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-01-18 00:54:19 +09:00
Daniel Dickinson
f00a1ac2d9 Merge pull request #953 from musashino205/mount-fix-disp
luci-mod-admin-full: Fix display problems of mount
2017-01-16 10:45:20 -05:00
Daniel Dickinson
be28190838 Merge pull request #947 from danrl/proto-wireguard
luci-proto-wireguard: enable addressing for tunnel interfaces
2017-01-16 09:39:55 -05:00
Daniel Dickinson
348a6fde90 Merge pull request #817 from ascob/luci-app-dynapoint
luci-app-dynapoint: new package
2017-01-16 09:28:26 -05:00