project/luci.git
2 years agotimezone data: update to 2018d for-15.05
Hannu Nyman [Sat, 7 Apr 2018 21:05:58 +0000 (00:05 +0300)]
timezone data: update to 2018d

Update timezone data to 2018d
http://mm.icann.org/pipermail/tz-announce/2018-March/000049.html
  In 2018, Palestine starts DST on March 24, not March 31.
     Adjust future predictions accordingly.
  Casey Station in Antarctica changed from +11 to +08
(cherry picked from commit c7369830b62b69b9537ec68f6bfe193e11963164)

timezone data: update to 2018c
Update timezone data to 2018c
http://mm.icann.org/pipermail/tz-announce/2018-January/000048.html
   Briefly:
   Sao Tome and Príncipe switched from +00 to +01.
   Brazil's DST will now start on November's first Sunday.
(cherry picked from commit eae2f37b62393b0355238507ffdddb045b7d2fdb)

timezone data: update to 2017c
Update timezone data to 2017c
http://mm.icann.org/pipermail/tz-announce/2017-October/000047.html
   Briefly:
   Northern Cyprus switches from +03 to +02/+03 on 2017-10-29.
   Fiji ends DST 2018-01-14, not 2018-01-21.
   Namibia switches from +01/+02 to +02 on 2018-04-01.
   Sudan switches from +03 to +02 on 2017-11-01.
   Tonga likely switches from +13/+14 to +13 on 2017-11-05.
   Turks & Caicos switches from -04 to -05/-04 on 2018-11-04.
(cherry picked from commit ede51e4641b1053e214d294e06a935e0b2bcf09a)

luci-base: add Etc/GMT timezones
Add Etc/GMT timezones like GMT+5
(cherry picked from commit f2cf516cf7d50c191e3ea94f4696a6c60348cf92)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2 years agoMerge pull request #1578 from user7887/for-15.05
Hannu Nyman [Sun, 21 Jan 2018 15:52:17 +0000 (17:52 +0200)]
Merge pull request #1578 from user7887/for-15.05

i18n-ru:fixed and updated russian translation+update by script

2 years agoi18n-ru:fixed and updated russian translation+update by script 1578/head
Vladimir [Sun, 21 Jan 2018 15:42:22 +0000 (18:42 +0300)]
i18n-ru:fixed and updated russian translation+update by script

Signed-off-by: Vladimir <picfun@ya.ru>
3 years agoMerge pull request #1164 from angusding/patch-5
Hannu Nyman [Tue, 16 May 2017 16:22:41 +0000 (19:22 +0300)]
Merge pull request #1164 from angusding/patch-5

luci.mk: Update language name for Chinese

3 years agoluci.mk: Update language name for Chinese 1164/head
amitabha [Thu, 11 May 2017 13:59:38 +0000 (21:59 +0800)]
luci.mk: Update language name for Chinese

Rectification of non-standard name for language Chinese.
Signed-off-by: Angus Ding angus.ding@gmail.com
3 years agoMerge pull request #1142 from angusding/patch-2
Hannu Nyman [Mon, 1 May 2017 14:21:11 +0000 (17:21 +0300)]
Merge pull request #1142 from angusding/patch-2

luci-app-upnp: Update Chinese translation

3 years agoluci-app-upnp Update Chinese translation 1142/head
amitabha [Mon, 1 May 2017 13:06:21 +0000 (21:06 +0800)]
luci-app-upnp Update Chinese translation

Update Chinese translations.
Signed-off-by: Angus Ding angus.ding@gmail.com
3 years agotimezone data: update to 2017b
Hannu Nyman [Mon, 10 Apr 2017 11:45:20 +0000 (14:45 +0300)]
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 54c97738bcfd715bc36fd88fac46605bac596e04)

3 years agoMerge pull request #935 from chris5560/for-15.05
Christian Schoenebeck [Fri, 13 Jan 2017 08:54:41 +0000 (09:54 +0100)]
Merge pull request #935 from chris5560/for-15.05

[for-15.05] luci-app-ddns: support for backported ddns-scripts 2.7.6

3 years ago[for-15.05] luci-app-ddns: adaption to support backported ddns-scripts 2.7.6 935/head
Christian Schoenebeck [Wed, 11 Jan 2017 19:13:55 +0000 (20:13 +0100)]
[for-15.05] luci-app-ddns: adaption to support backported ddns-scripts 2.7.6

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
3 years agoMerge pull request #920 from cls1997/patch-1
Hannu Nyman [Thu, 5 Jan 2017 14:44:45 +0000 (16:44 +0200)]
Merge pull request #920 from cls1997/patch-1

Update statistics.po

3 years agoUpdate statistics.po 920/head
ChenLingshu [Thu, 5 Jan 2017 14:39:13 +0000 (22:39 +0800)]
Update statistics.po

Phrase "system load" right Simplified Chinese translated as "系统负载"

3 years agotime zone data: Update to 2016j
Hannu Nyman [Fri, 9 Dec 2016 16:10:44 +0000 (18:10 +0200)]
time zone data: Update to 2016j

Changes:
     Saratov, Russia switches from +03 to +04 on 2016-12-04 at 02:00.
     This hives off a new zone Europe/Saratov from Europe/Volgograd.

     The new zone Asia/Atyrau for Atyraū Region, Kazakhstan, is like
     Asia/Aqtau except it switched from +04/+05 to +05/+06 in spring
     1999, not fall 1994.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit a7c5c018b6782f4160410981c723c82db9762ff7)

3 years agotime zone data: Update to 2016i
Hannu Nyman [Tue, 8 Nov 2016 10:40:53 +0000 (12:40 +0200)]
time zone data: Update to 2016i

Note that several of the time zones now use a numeric name
that is quoted with < >  (e.g. "<+03>-3")

musl 1.1.15 and earlier have a bug with < > quoted time zone names.
Fix for the bug
* has already been patched in musl upstream with
  http://git.musl-libc.org/cgit/musl/commit/?id=8ca27ac4bfe73bff785d0c26c1de0da92b55e5c6
* has been committed in LEDE with
  https://github.com/lede-project/source/commit/671cb35880308404a17c430c4b3b13dd506a5671
* has been submitted to Openwrt as pull request
  https://github.com/openwrt/openwrt/pull/163

Key changes in 2016d-2016i:
---------------------------

2016d:
     America/Caracas switches from -0430 to -04 on 2016-05-01.

     Asia/Magadan switches from +10 to +11 on 2016-04-24.

     New zone Asia/Tomsk, split off from Asia/Novosibirsk.

2016f:
     Asia/Novosibirsk switches from +06 to +07 on 2016-07-24.

     Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
     abbreviations instead of invented ones.

2016g:
     Turkey switched from EET/EEST (+02/+03) to permanent +03,
     effective 2016-09-07. Use "+03" rather than an invented
     abbreviation for the new time.

     Several zones in Antarctica and the former Soviet Union, along
     with zones intended for ships at sea that cannot use POSIX TZ
     strings, now use numeric time zone abbreviations instead of
     invented or obsolete alphanumeric abbreviations.

2016h:
     Asia/Gaza and Asia/Hebron end DST on 2016-10-29, not
     2016-10-21. Predict that future fall transitions will
     be on the last Saturday of October.

     Asia/Colombo now uses numeric time zone abbreviations like "+0530"
     instead of alphabetic ones like "IST" and "LKT".

2016i:
     Pacific/Tongatapu begins DST on 2016-11-06, ending on
     2017-01-15.  Assume future observances in Tonga will be
     from the first Sunday in November through the third Sunday in
     January, like Fiji. Switch to numeric time zone abbreviations
     for this zone.

     Northern Cyprus is now +03 year round, causing a split in Cyprus
     time zones starting 2016-10-30 at 04:00. This creates a zone
     Asia/Famagusta.

     Antarctica/Casey switched from +08 to +11 on 2016-10-22.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 3936e79cf8d5d6df7c2c529dd1daacbd8d5ed31b)

4 years agoMerge pull request #667 from chris5560/for-15.05 825/head 827/head
Christian Schoenebeck [Sun, 24 Jul 2016 18:27:48 +0000 (20:27 +0200)]
Merge pull request #667 from chris5560/for-15.05

[for-15.05] luci-app-polipo: remove Parent proxy address field check

4 years agoluci-app-adblock: adjust to adblock 1.2.0
Hannu Nyman [Thu, 16 Jun 2016 08:25:15 +0000 (11:25 +0300)]
luci-app-adblock: adjust to adblock 1.2.0

* more status info
* change in default nullipv addresses
* two uhttpd instances (for ports 80/443)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit cd50f27956f5c30c13b52e8a70178ce07972d552)

4 years agoluci-app-adblock: support 1.16
Hannu Nyman [Sat, 4 Jun 2016 07:45:55 +0000 (10:45 +0300)]
luci-app-adblock: support 1.16

Add support for 'adb_restricted'

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit e87132021b9117ea9feb7b6b7f0633db5cf8bede)

4 years agoluci-app-adblock: support adb_fetchttl option
Hannu Nyman [Thu, 26 May 2016 16:01:12 +0000 (19:01 +0300)]
luci-app-adblock: support adb_fetchttl option

Support adb_fetchttl options from adblock 1.1.15

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit c46963613f7f1312dac62e507346777ba6f8d8a6)

4 years agoAdd support for showing ipv6 NAT table in Luci
Hannu Nyman [Fri, 3 Jun 2016 07:27:07 +0000 (10:27 +0300)]
Add support for showing ipv6 NAT table in Luci

When kmod-nf-nat6 and kmod-ipt-nat6 are installed, the firewall has also
the 'nat' table for ipv6, and packages like 'adblock' utilize that table.

Currently that table is not shown on the Luci firewall status page,
although it is visible by 'ip6tables -L -v -t nat' from console.

Detect 'nat' table's presence from /proc/net/ip6_tables_names

Show 'nat' table in Status->Firewall->IPv6 if that table is present.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit a77ff30057c691009dac646adbac28d6230814b6)

4 years agoluci-base: remove deprecated 6relayd from ucitrack
Hannu Nyman [Wed, 25 May 2016 19:26:36 +0000 (22:26 +0300)]
luci-base: remove deprecated 6relayd from ucitrack

Cleanup /etc/config/ucitrack by removing '6relayd' item,
as the whole 6relayd package was removed in 2014.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit e336dbed3980e693e5c47e2224aacb3c651f815e)

4 years agoi18n: sync translations
Hannu Nyman [Sat, 21 May 2016 08:23:19 +0000 (11:23 +0300)]
i18n: sync translations

Sync transltions.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-base: Turn off pattern matching when generating distversion
Chuanhong Guo [Sat, 21 May 2016 08:14:31 +0000 (11:14 +0300)]
luci-base: Turn off pattern matching when generating distversion

Otherwize the distrevision may be displayed twice
if it contains some special matching patterns.
(For example I am using "git-$hash" in my own OpenWrt branch.)
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
(cherry picked from commit c1f0a9971a0b75515996cd59dfaf70f3ff6cc624)

4 years agoluci-app-statistics: option for max/avg data when not rrasingle
Hannu Nyman [Thu, 12 May 2016 07:26:59 +0000 (10:26 +0300)]
luci-app-statistics: option for max/avg data when not rrasingle

Introduce option that enables the user to select max values
instead of averages for graphs if the user has disabled RRAsingle.

The option defaults to average values, which have been the default
in Luci statistics.

Remove 'optional' from RRASingle, as it is a key option for statistics.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b213573682460dd395878c7369aba173f00bbb99)

4 years agoGraph the max value rather than avg if rrdsingle disabled
Kevin Darbyshire-Bryant [Thu, 31 Dec 2015 18:00:55 +0000 (18:00 +0000)]
Graph the max value rather than avg if rrdsingle disabled

With rrdsingle the average values are used for graphing. As the
timescale increases (say over a day or month) the average values
progressively reduce.  Using the maximum value over the longer periods
is arguably no less deceptive but it does produce more informative
graphs.

V2 - Invert the default path logic related to rra.single

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
(cherry picked from commit f960a5286896aacbd95a7b95aa367d1584106b2b)

4 years agoluci-mod-admin-full: dnsmasq options quietdhcp and sequential_ip
Hannu Nyman [Sun, 1 May 2016 20:26:42 +0000 (23:26 +0300)]
luci-mod-admin-full: dnsmasq options quietdhcp and sequential_ip

Add support for dnsmasq uci options 'quietdhcp' and 'sequential_ip'
(disable logging, allocate ip addresses sequentially)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b9dbf1bc2c4c26bd7a0aa75363466589d270b24f)

4 years agoMerge pull request #719 from SvenRoederer/add_community_cottbus
Hannu Nyman [Wed, 11 May 2016 06:13:19 +0000 (09:13 +0300)]
Merge pull request #719 from SvenRoederer/add_community_cottbus

freifunk-profiles: add profile Cottbus

4 years agoMerge pull request #718 from SvenRoederer/fix/freifunk-communitysetting-selection...
Hannu Nyman [Wed, 11 May 2016 06:13:13 +0000 (09:13 +0300)]
Merge pull request #718 from SvenRoederer/fix/freifunk-communitysetting-selection/for-15.05

luci-mod-freifunk: fix lookup of community-name

4 years agofreifunk-profiles: add profile Cottbus 719/head
Sven Roederer [Tue, 10 May 2016 23:41:54 +0000 (01:41 +0200)]
freifunk-profiles: add profile Cottbus

- add the current community-file for freifunk Cottbus to for-15.05 branch
- this is a copy of the file with all commits up to "Jan 4, 2016"

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
4 years agoluci-mod-freifunk: fix lookup of community-name 718/head
Sven Roederer [Sun, 24 Apr 2016 20:38:26 +0000 (22:38 +0200)]
luci-mod-freifunk: fix lookup of community-name

restore the lookup of the freifunk community-name stored in
uci "freifunk.community.name".
In https://github.com/openwrt/luci/commit/9780ee382e72f8a5fb69e337a3fcc51fc0914883
the value changed to the complete path of the community-profile, e.g.
"/etc/config/profile_berlin". This causes lookup problems on other
pages, like "mod-freifunk -> overview -> index" (view/freifunk/index.htm line37, line 54).
And as the option suggests it's the community-name not the community-profile path.

This is a backport of https://github.com/openwrt/luci/commit/61c7157a66b4bbce7d110cc0de8164bd2bd57798

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
4 years agoluci-app-adblock: adjust to change in option name
Hannu Nyman [Sun, 1 May 2016 07:51:04 +0000 (10:51 +0300)]
luci-app-adblock: adjust to change in option name

Change also the adb_nullport option name to match 1.1.0

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 96c5069ca676d05d1f057fef1f1810701999d101)

4 years agoluci-app-adblock: match adblock 1.1.0
Hannu Nyman [Sat, 30 Apr 2016 23:55:45 +0000 (02:55 +0300)]
luci-app-adblock: match adblock 1.1.0

Update the luci app to match adblock 1.1.0
Add support for showing blocklist status info.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b45520011f93aec197ec195aa4af59028204c7d0)

4 years agoMerge pull request #712 from SvenRoederer/fix/deps_for_app-olsr
Hannu Nyman [Sun, 8 May 2016 17:56:59 +0000 (20:56 +0300)]
Merge pull request #712 from SvenRoederer/fix/deps_for_app-olsr

luci-app-olsr: depend on luci-lib-json

4 years agoluci-app-olsr: depend on luci-lib-json 712/head
Sven Roederer [Thu, 5 May 2016 12:20:44 +0000 (14:20 +0200)]
luci-app-olsr: depend on luci-lib-json

backport of https://github.com/openwrt/luci/commit/ba897c6a209eec3a4ea447a66407a385170ccb80

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
4 years agoMerge pull request #704 from feckert/fix_dsl_spelling
Hannu Nyman [Tue, 19 Apr 2016 07:26:19 +0000 (10:26 +0300)]
Merge pull request #704 from feckert/fix_dsl_spelling

luci-mod-admin-full: change spelling ADSL to xDSL

4 years agoluci-mod-admin-full: change spelling ADSL to xDSL 704/head
Florian Eckert [Mon, 18 Apr 2016 12:49:52 +0000 (14:49 +0200)]
luci-mod-admin-full: change spelling ADSL to xDSL

DSL has one more transmission technologies this is VDSL.
Spelling xDSL reflect this

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
4 years agoluci-base: read odhcpd leasefile location via uci
Hannu Nyman [Sun, 17 Apr 2016 09:10:24 +0000 (12:10 +0300)]
luci-base: read odhcpd leasefile location via uci

Check the location of the odhcpd leasefile from /etc/config/dhcp
via uci. Fallback to the default location.

This fixes #702

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 51a7f96877d8c5bf70217073ed8aa7ab6a196d20)

4 years agotimezone data: update to 2016c
Hannu Nyman [Wed, 30 Mar 2016 08:30:36 +0000 (11:30 +0300)]
timezone data: update to 2016c

Update timezone data to 2016c.

2016b: http://mm.icann.org/pipermail/tz-announce/2016-March/000036.html

   Changes affecting future time stamps

     New zones Europe/Astrakhan and Europe/Ulyanovsk for Astrakhan and
     Ulyanovsk Oblasts, Russia, both of which will switch from +03 to +04
     on 2016-03-27 at 02:00 local time.  They need distinct zones since
     their post-1970 histories disagree.  New zone Asia/Barnaul for Altai
     Krai and Altai Republic, Russia, which will switch from +06 to +07
     on the same date and local time.  Also, Asia/Sakhalin moves from +10
     to +11 on 2016-03-27 at 02:00.

     As a trial of a new system that needs less information to be made up,
     the new zones use numeric time zone abbreviations like "+04"
     instead of invented abbreviations like "ASTT".

     Haiti will not observe DST in 2016.

     Palestine's spring-forward transition on 2016-03-26 is at 01:00,
     not 00:00. Guess future transitions will be March's last Saturday
     at 01:00, not March's last Friday at 24:00.

2016c: http://mm.icann.org/pipermail/tz-announce/2016-March/000037.html

   Changes affecting future time stamps

     Azerbaijan no longer observes DST.

     Chile reverts from permanent to seasonal DST.
     Guess that future transitions are August's and May's second
     Saturdays at 24:00 mainland time.  Also, call the period from
     2014-09-07 through 2016-05-14 daylight saving time instead of
     standard time, as that seems more appropriate now.

Note for Openwrt usage:

Either musl or busybox does not like the new timezone format.
Although the rule looks ok in /etc/TZ, timezone is interpreted wrongly
by date, uptime etc. "Old timezones" are handle correctly, but these
new "<+04>-4" style zones do not work. Example below:

Europe/Helsinki
 root@OpenWrt:~# cat /etc/TZ
 EET-2EEST,M3.5.0/3,M10.5.0/4
 root@OpenWrt:~# uptime
  11:00:52 up 18:17,  load average: 0.43, 0.13, 0.11
 root@OpenWrt:~# date
 Wed Mar 30 11:00:55 EEST 2016

Europe/Astrakhan
 ( Time is showed as GMT instead of the correct zone and
   zone name is parsed wrongly )
 root@OpenWrt:~# cat /etc/TZ
 <+04>-4
 root@OpenWrt:~# uptime
  08:02:52 up 18:19,  load average: 0.17, 0.18, 0.13
 root@OpenWrt:~# date
 Wed Mar 30 08:02:59 +04>-4 2016

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 859e4353783c3c9b6b23eaa51604d360a73c1236)

4 years agoCC luci-mod-admin-full: Enable reset in Luci also for ubi
Hannu Nyman [Tue, 29 Mar 2016 07:37:29 +0000 (10:37 +0300)]
CC luci-mod-admin-full: Enable reset in Luci also for ubi

Enable reset in LuCI also for ubi based firmwares.
Discussion at #672

Backport of 5b79e62c0a99bab8dfb8dce8124d9fecc11da54b

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-app-statistics: Fix disk usage graphing
Daniel Dickinson [Fri, 25 Mar 2016 08:04:58 +0000 (04:04 -0400)]
luci-app-statistics: Fix disk usage graphing

Disk usage graphing was broken.  This fixes it.

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
(cherry picked from commit 6d2163eb622a6f4da43b6ecc8379a1fc891b5b0b)

4 years agoa cleaner solution for disabling dyngw and dyngw_plain in freifunk-policyrouting...
Manuel Munz [Mon, 4 Jan 2016 21:34:55 +0000 (22:34 +0100)]
a cleaner solution for disabling dyngw and dyngw_plain in freifunk-policyrouting init

4 years agoi18n: sync translations
Hannu Nyman [Mon, 21 Mar 2016 10:59:49 +0000 (12:59 +0200)]
i18n: sync translations

Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-mod-admin-full: Fix dhcpv6 ra_management option stateless value
Hannu Nyman [Sat, 19 Mar 2016 13:38:41 +0000 (15:38 +0200)]
luci-mod-admin-full: Fix dhcpv6 ra_management option stateless value

Fix dhcpv6 ra_management option's handling of "stateless" value.
Default value for the option is 1, so trying to store ""
instead of "0" for stateless is not working.

This fixes #676

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 355c21304afb0d388fb8bd6132e0dbcb19f03428)

4 years agoluci-app-adblock: backport the package from master
Hannu Nyman [Wed, 16 Mar 2016 14:15:24 +0000 (16:15 +0200)]
luci-app-adblock: backport the package from master

Backport the luci-app-adblock package from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoMerge pull request #674 from feckert/cron_bugfix
Jo-Philipp Wich [Wed, 16 Mar 2016 11:35:07 +0000 (12:35 +0100)]
Merge pull request #674 from feckert/cron_bugfix

luci-mod-admin-full: allow writing empty crontab config

4 years agoMerge pull request #673 from feckert/bugfix_sleep_sysupgrade
Jo-Philipp Wich [Wed, 16 Mar 2016 10:46:48 +0000 (11:46 +0100)]
Merge pull request #673 from feckert/bugfix_sleep_sysupgrade

luci-mod-admin-full: add sleep before sysupgrade

4 years agoluci-mod-admin-full: add sleep before sysupgrade 673/head
Florian Eckert [Tue, 15 Mar 2016 14:31:54 +0000 (15:31 +0100)]
luci-mod-admin-full: add sleep before sysupgrade

- Under some conditions the system will shutdown
  uhttpd before the page will be delivered to
  the client. Waiting one second should eleminate
  this behaviour.

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
4 years agoluci-mod-admin-full: allow writing empty crontab config 674/head
Florian Eckert [Wed, 16 Mar 2016 10:08:16 +0000 (11:08 +0100)]
luci-mod-admin-full: allow writing empty crontab config

Write an empty crontab file to remove all content
from file /etc/crontabs/root

Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
4 years agoluci-base: Include Openwrt build revision in displayed version string
Hannu Nyman [Fri, 11 Mar 2016 12:09:39 +0000 (14:09 +0200)]
luci-base: Include Openwrt build revision in displayed version string

The version string displayed in the footer and the overview page contains
both LuCI and Openwrt versions. But due to differences in the contents
of /etc/openwrt_release the exact Openwrt revision r..... may be missing:
* In trunk that revision is included in the DISTRIB_DESCRIPTION field that
  is displayed in Luci as the Openwrt version.
* In release branches, that field contains the release number like 15.05.

Revision number is always present in DISTRIB_REVISION field, so add the
revision from that field in case the revision is not already present
in the string.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 50451c4ac53c853cbf2837e7bfbbc1268a440180)

4 years agoLuCI: Display the proper LuCI git branch in GUI
Hannu Nyman [Thu, 10 Mar 2016 17:50:58 +0000 (19:50 +0200)]
LuCI: Display the proper LuCI git branch in GUI

Adjust luci.mk and luci-base to find out correctly if Luci is built
from master or from a branch. Display that value in the footer and
the overview page.

* Evaluate the git branch in luci.mk and pass that to LuCI submodules
  as a make variable. Use branch name, ignore tags.
* Deprecate svn detection in luci-base's mkversion.sh that generates
  version.lua. Simply use the value passed by make.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 7553654bb10af9206cff9837a485b828d1998213)

4 years ago[for-15.05] luci-app-polipo: remove Parent proxy address field check 667/head
Christian Schoenebeck [Mon, 7 Mar 2016 20:20:47 +0000 (21:20 +0100)]
[for-15.05] luci-app-polipo: remove Parent proxy address field check

remove Parent proxy address field check https://dev.openwrt.org/ticket/15680

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
4 years agoFix embedded links: github instead of luci.subsignal.org
Hannu Nyman [Tue, 2 Feb 2016 10:07:16 +0000 (12:07 +0200)]
Fix embedded links: github instead of luci.subsignal.org

Fix links to point into Github repo instead of luci.subsignal.org
 - the hint to file a bug in dispatcher
 - footers of Bootstrap and Freifunk themes

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit c2cf5d185587c3ad8d550c39707e744ee2b0811d)

4 years agotimezone data: update to 2016a
Hannu Nyman [Sun, 7 Feb 2016 10:28:16 +0000 (12:28 +0200)]
timezone data: update to 2016a

Update timezone data to 2016a.

http://mm.icann.org/pipermail/tz-announce/2016-January/000035.html

   Changes affecting future time stamps

     America/Cayman will not observe daylight saving this year after all.
     Revert our guess that it would.  (Thanks to Matt Johnson.)

     Asia/Chita switches from +0800 to +0900 on 2016-03-27 at 02:00.
     (Thanks to Alexander Krivenyshev.)

     Asia/Tehran now has DST predictions for the year 2038 and later,
     to be March 21 00:00 to September 21 00:00.  This is likely better
     than predicting no DST, albeit off by a day every now and then.

   Changes affecting past and future time stamps

     America/Metlakatla switched from PST all year to AKST/AKDT on
     2015-11-01 at 02:00.  (Thanks to Steffen Thorsen.)

     America/Santa_Isabel has been removed, and replaced with a
     backward compatibility link to America/Tijuana.  Its contents were
     apparently based on a misreading of Mexican legislation.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 9b5724d39ea7b5da3cec358f26ec2ef698c73690)

4 years agoi18n: Sync translations
Hannu Nyman [Wed, 3 Feb 2016 09:51:35 +0000 (11:51 +0200)]
i18n: Sync translations

Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-app-statistics: Remove usually empty std.dev. graph from ping page
Hannu Nyman [Tue, 2 Feb 2016 12:22:16 +0000 (14:22 +0200)]
luci-app-statistics: Remove usually empty std.dev. graph from ping page

Remove the usually empty standard deviation graph from the ping page.

The graph is empty for most users as collectd measures standard deviation
of individual pings inside the general interval of statistics collection.
Default setting for both ping interval and general collection interval
is 30s in Luci statistics, meaning just 1 ping per interval, which
leads to empty graph.

(To provide relveant data, the ping interval should be 1/4-1/5 of the
general collection interval. Even then the graph does not look very
informative due to different scaling than the latency graph.)

Note that this commit does not change collectd itself, which continues
to collect and calculate also the std.dev. data, which can be fetched
with 'rrdtool' if needed.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry-picked from 8f8957f90f2c593e233d867cab48519a2215b8a0)

4 years agoluci-mod-admin-full: prevent crash if channel of sta is unknown (#624)
Jo-Philipp Wich [Sun, 17 Jan 2016 18:04:02 +0000 (19:04 +0100)]
luci-mod-admin-full: prevent crash if channel of sta is unknown (#624)

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-mod-admin-full: avoid indexing iw.hwmodelist directly
Jo-Philipp Wich [Fri, 15 Jan 2016 13:13:44 +0000 (14:13 +0100)]
luci-mod-admin-full: avoid indexing iw.hwmodelist directly

Prevent a nil field access when hwmodelist is undefined.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoMerge pull request #615 from SvenRoederer/for-15.05_openwrt
Hannu Nyman [Tue, 29 Dec 2015 21:40:09 +0000 (23:40 +0200)]
Merge pull request #615 from SvenRoederer/for-15.05_openwrt

[Makefile] make include of luci.mk relative

4 years agobackport [Makefile] make include of luci.mk relative 615/head
Sven Roederer [Tue, 29 Dec 2015 14:57:17 +0000 (15:57 +0100)]
backport [Makefile] make include of luci.mk relative
Backport of commit e6ef89307154d496a76c118db7b88aff05b0394b from trunk

Signed-off-by: Sven Roederer devel-sven@geroedel.de
4 years agoluci-mod-admin-full: interface status page / clarify address display
Hannu Nyman [Mon, 21 Dec 2015 21:02:12 +0000 (23:02 +0200)]
luci-mod-admin-full: interface status page / clarify address display

Backport commit e42e5f58651983b9971c2facb08354cc2273dbef
  Copy the changes made by f8d0ba0
  also to the interface details pages in order to clarify display of
  multiple addresses.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agofor-15-05: luci-mod-admin-full: update IPv4/IPv6 list views
Hannu Nyman [Fri, 18 Dec 2015 17:19:36 +0000 (19:19 +0200)]
for-15-05: luci-mod-admin-full: update IPv4/IPv6 list views

Clarify address presentation on the Network/Interfaces page
by backporting f8d0ba00b2ff27dc9e2f10712bc343ae655fbdf9 :
  For better view of 'Interface Overview' IPv4/IPv6 addresses for
  interfaces should be displayed as lists, but not as comma separated
  strings.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agomodules/luci-mod-rpc: fix attempt to index global 'luci' (a nil value)
Sabbir Ahmed [Sat, 12 Sep 2015 09:11:18 +0000 (15:11 +0600)]
modules/luci-mod-rpc: fix attempt to index global 'luci' (a nil value)

4 years agoCONTRIBUTING.md: clarify signed-off-by advice
Hannu Nyman [Tue, 15 Dec 2015 12:37:46 +0000 (14:37 +0200)]
CONTRIBUTING.md: clarify signed-off-by advice

Clarify the signed-off-by advice in CONTRIBUTING.md.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit ff2f536dd1473da59ae968e6294c6813d1093c58)

4 years agoCONTRIBUTING.md: Add advice on pull requests
Hannu Nyman [Tue, 29 Sep 2015 07:38:58 +0000 (10:38 +0300)]
CONTRIBUTING.md: Add advice on pull requests

Add advice on pull requests and best practices in working with Github.
Minor corrections & updates.
Adjust to Github 'markdown' syntax.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 0e2c555c30dbc6fc6f48ad3645d6380a3bc98d72)

4 years agofor-15.05 i18n: sync translations
Hannu Nyman [Sun, 6 Dec 2015 11:30:58 +0000 (13:30 +0200)]
for-15.05 i18n: sync translations

Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agocontrib/package/freifunk-policyrouting: remove rc.d symlink
Manuel Munz [Wed, 18 Nov 2015 11:27:20 +0000 (12:27 +0100)]
contrib/package/freifunk-policyrouting: remove rc.d symlink

4 years agofix a typo error in command script shown to users
Ran Bao [Thu, 5 Nov 2015 23:48:47 +0000 (12:48 +1300)]
fix a typo error in command script shown to users

Signed-off-by: Ran Bao <worksev@gmail.com>
(cherry picked from commit 38b7c6cef44b5b8d2a87706a975327c7c7664c49)

4 years agoluci-mod-admin-full: limit interface name length to 15 chars
Hannu Nyman [Thu, 5 Nov 2015 08:54:33 +0000 (10:54 +0200)]
luci-mod-admin-full: limit interface name length to 15 chars

Limit the name of a new interface to 15 characters.
Add a note about the maximum length and the automatic protocol/bridge
prefixes (br-, 6in4-, pppoe- etc.).

Reference to:
https://dev.openwrt.org/ticket/20380
https://github.com/openwrt/luci/issues/507

There is a 15 character limit to the "real" interface name,
enforced both in the firewall and dnsmasq. The real interface name
includes the possible prefix "br-", "6in4-" etc. Example of an error:
  interface name `br-lan_protected' must be shorter than IFNAMSIZ (15)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b1217c88c3566c1bd726bce9203da591af564bcf)

4 years agoluci-app-firewall: limit zone name length to 11 characters
Hannu Nyman [Wed, 28 Oct 2015 11:07:47 +0000 (13:07 +0200)]
luci-app-firewall: limit zone name length to 11 characters

Change the maximum length of a firewall zone name from 14 to 11 characters.

Longer names break iptables rule generation (max. 29 chars are allowed).

XT_EXTENSION_MAXNAMELEN = 29
29 - sizeof("postrouting_") - sizeof("_rule") - sizeof("\0") = 11

References to:
https://github.com/openwrt/luci/issues/507
https://dev.openwrt.org/ticket/20380

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 87b6bb0dafbbe46dc7669356ac3db24aa975c4b7)

4 years agoapplications/asterisk: Remove incorrect dependency
Daniel Dickinson [Tue, 29 Sep 2015 07:47:31 +0000 (03:47 -0400)]
applications/asterisk: Remove incorrect dependency

ahcpd dependency appears to have come from a cut-n-paste from
luci-app-ahcpd.

(cherry picked from commit 91220dac08f9eff27f011fb19d49f1a6ec98bcb0 )

4 years agoMove libubus-lua dependency to luci-base
Jo-Philipp Wich [Tue, 27 Oct 2015 12:09:03 +0000 (13:09 +0100)]
Move libubus-lua dependency to luci-base

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-app-diag-devinfo: mark broken due to dependencies
Hannu Nyman [Tue, 27 Oct 2015 07:57:57 +0000 (09:57 +0200)]
luci-app-diag-devinfo: mark broken due to dependencies

Mark luci-app-diag-devinfo @BROKEN as it has several failing dependencies:

Four dependencies from "oldpackages":
 httping, mac-to-devinfo, smap-to-devinfo, netdiscover-to-devinfo

One dependency from "abandoned":
 smap

(netdiscover is currently ok in trunk, but not in 15.05.)

Reference to Luci issue #523.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit ec6ccf1cd3225b51b958b38c7439f1dea8c28457)

4 years agoluci-app-statistics: Adjust ping graphs to show target hosts separately
Hannu Nyman [Sun, 25 Oct 2015 08:19:26 +0000 (10:19 +0200)]
luci-app-statistics: Adjust ping graphs to show target hosts separately

Ping statistics plugin allows the user to define multiple ping targets.
The graphs have so far shown multiple hosts in a stacked way.
Adjust graphs to show the target hosts separately (overlay=true).

Clarify the plugin definition with some additional line spacing.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 53d767de5ea8c596936fbf0bddce357efe0c4425)

4 years agoluci-app-statistics: improve scaling of the associated stations graph
Hannu Nyman [Sun, 25 Oct 2015 08:11:35 +0000 (10:11 +0200)]
luci-app-statistics: improve scaling of the associated stations graph

Improve scaling of the associated stations graph on the wireless page.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit dccf4859221c79718f08eeb085aefa866492427c)

4 years agoluci-app-statistics: backport 'reorder interface and netlink datasources'
Hannu Nyman [Sat, 24 Oct 2015 10:39:36 +0000 (13:39 +0300)]
luci-app-statistics: backport 'reorder interface and netlink datasources'

Backport from commit 78c61d6d the interface and netlink plugin changes.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci-app-statistics: add support for sorting RRD data sources
Jo-Philipp Wich [Mon, 5 Oct 2015 17:11:13 +0000 (19:11 +0200)]
luci-app-statistics: add support for sorting RRD data sources

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
(cherry picked from commit c8c4a343c2e7ab2f7af00531d0c2fd30c33e51b4)

4 years agoluci-app-statistics: improve diagram generation, add missing title
Jo-Philipp Wich [Sat, 3 Oct 2015 13:30:59 +0000 (15:30 +0200)]
luci-app-statistics: improve diagram generation, add missing title

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
(cherry picked from commit c10a7380bf91d0d78ab55471d6becc501752602f)

4 years agoluci-app-statistics: rework graph label handling
Jo-Philipp Wich [Sat, 3 Oct 2015 13:29:25 +0000 (15:29 +0200)]
luci-app-statistics: rework graph label handling

Remove leftover unused translation code and properly escape colons in line
labels.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
(cherry picked from commit 96b031bbad59555cb2523a3cab1d0a058b39455b)

4 years agoBackport luci-base: filter invalid opkg status lines
Hannu Nyman [Sat, 24 Oct 2015 06:40:55 +0000 (09:40 +0300)]
Backport luci-base: filter invalid opkg status lines

Backport of commit 6b3f804 from trunk.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agofor-15.05 opkg/packages: Show package size in list of available packages
Hannu Nyman [Wed, 16 Sep 2015 09:47:48 +0000 (12:47 +0300)]
for-15.05 opkg/packages: Show package size in list of available packages

CC15.05 opkg was patched by https://dev.openwrt.org/changeset/47196
to support the --size option. This commit backports the Luci features:

Add package *.ipk size information to package listing in Luci,
as opkg was today extended to support listing also the size information.
Visible fields are now: name, version, size, description

That will help users considering installation of a certain package
to assess its size impact on flash.

Note: Opkg data includes the size of the .ipk file, not the expanded size.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 3288fe76ab3d2269abcf902d0df6f847c6200e8e)

4 years agofor-15.05: Sync translations
Hannu Nyman [Tue, 13 Oct 2015 10:00:37 +0000 (13:00 +0300)]
for-15.05: Sync translations

Sync translations to the current strings.

Changes in luci-app-ddns, luci-app-statistics and luci-base

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
4 years agoluci.mk: correct SK language name to Slovak
Hannu Nyman [Tue, 13 Oct 2015 07:13:50 +0000 (10:13 +0300)]
luci.mk: correct SK language name to Slovak

SK language code refers to Slovak, not Slovene.
Native language name is correct.

References:
https://forum.openwrt.org/viewtopic.php?id=60235
https://en.wikipedia.org/wiki/Slovak_language

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 1d37c9c25dbe69967a2d71495109380299974aa8)

4 years agoluci-app-statistics: reorganise menu items
Hannu Nyman [Mon, 12 Oct 2015 11:23:10 +0000 (14:23 +0300)]
luci-app-statistics: reorganise menu items

Reorganise the menu items of the Luci statistics module:

* Re-label "Collectd" to "Setup" and place it after the "Graphs" items.
  - "Graphs" is used much more frequently so it should be first.
  - Change "Collectd" menu item to "Setup" to clarify things.

* Re-label "System plugins" to "General plugins" to change sorting.
  "Network / Output / System" changes to "General / Network / Output"
  that is more logical order for the items.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit da5b25187b245883fa52d569970a6f5810330954)

4 years agoluci-base: change index.html to be more like current themes
Hannu Nyman [Mon, 12 Oct 2015 11:18:00 +0000 (14:18 +0300)]
luci-base: change index.html to be more like current themes

Change index.html that is visible for a second when entering Luci:
* Black text on white background (instead of white on black)
* Specify font as Arial/Helvetica

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b6fe9a70e6a3182b0d4bc7c7071c59b242402a05)

4 years agoluci-base: Add cache control in index.html
nightcoffee [Mon, 12 Oct 2015 11:17:02 +0000 (14:17 +0300)]
luci-base: Add cache control in index.html

Signed-off-by: Night Coffee <ydkf@qq.com>
(cherry picked from commit 08a38a0493465a933687f79542f7f9dca3d6a816)

4 years agoTimezone information: update to 2015g
Hannu Nyman [Mon, 12 Oct 2015 07:58:09 +0000 (10:58 +0300)]
Timezone information: update to 2015g

Changes in 2015g:
http://mm.icann.org/pipermail/tz-announce/2015-October/000034.html

     Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.

     Fiji's 2016 fall-back transition is scheduled for January 17, not 24.

     Fort Nelson, British Columbia will not fall back on 2015-11-01. It has
     effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
     New zone America/Fort_Nelson.

Note: the Turkey-related one-time rule change is not apparently catched by
the zoneinfo2lua script, so that change is not included in this commit.
(Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 2cfd11b27268b21adc3ed126fb2b6c90da604528)

4 years agoluci-mod-admin-full: status: survive broken DSL status output
Jo-Philipp Wich [Sat, 3 Oct 2015 14:11:11 +0000 (16:11 +0200)]
luci-mod-admin-full: status: survive broken DSL status output

Only attempt to call "dsl_func" if the dsl_control lucistat output could be
successfully evaluated.

Works around https://dev.openwrt.org/ticket/20607

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-app-statistics: only render index view for more than one instance
Jo-Philipp Wich [Sat, 3 Oct 2015 09:40:09 +0000 (11:40 +0200)]
luci-app-statistics: only render index view for more than one instance

If a plugin produces only one instance, e.g. netlink with just one interface
configured, then the controller will register no detail views which would
normally show all graphs but the index pacage of a given plugin will still
display the collapsed view without any possibility to reach the full listing.

Fix the problem by only rendering a linked index view when more than one
instance is present.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
4 years agoluci-mod-admin-full: fix dnsmasq no-hosts/addn-hosts options
Oliver Middleton [Sun, 27 Sep 2015 23:49:47 +0000 (00:49 +0100)]
luci-mod-admin-full: fix dnsmasq no-hosts/addn-hosts options

no-hosts does not disable addn-hosts.

Signed-off-by: Oliver Middleton <olliemail27@gmail.com>
(cherry picked from commit 0857aaa28b79c9ede1029aa9ce3160e92473f4d7)

4 years agofor-15.05 luci-base: set default mediaurlbase to bootstrap (default theme)
Hannu Nyman [Sun, 27 Sep 2015 07:01:36 +0000 (10:01 +0300)]
for-15.05 luci-base: set default mediaurlbase to bootstrap (default theme)

The mediaurlbase option in the default /etc/config/luci still points
to the old openwrt.org theme that is not installed by default.
The discrepancy was noted in the commit message for 55ab4e4ce22

After 55ab4e4ce22 the installed theme's uci-defaults script will correct
the setting at first boot, but we should not have a deprecated theme as
the default value. Set the default value to the default theme 'bootstrap'.

Related old discussion at #302

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 1209ab6ba617c5bf3a97a91653ea9210e07cf3af)

4 years agofor-15.05 luci-mod-admin-full: opkg config / prevent word-wrap
Hannu Nyman [Sat, 26 Sep 2015 18:06:46 +0000 (21:06 +0300)]
for-15.05 luci-mod-admin-full: opkg config / prevent word-wrap

Prevent word-wrap on the config input areas. Especially the feed
definition lines can be long, and automatic word-wrap can decrease
clarity.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit c91a5eb2c49e583717913ca9da45b9175567649a)

4 years agofor-15.05 luci-mod-admin-full: restore opkg feed config capability
Hannu Nyman [Sat, 26 Sep 2015 18:04:10 +0000 (21:04 +0300)]
for-15.05 luci-mod-admin-full: restore opkg feed config capability

opkg config change from r46491 was backported to CC15.05
by https://dev.openwrt.org/changeset/46848/

Existing /etc/opkg.conf was split to three:
   /etc/opkg.conf -> base opkg configuration
   /etc/opkg/distfeeds.conf -> default Openwrt package feeds
   /etc/opkg/customfeeds.conf -> custom package feeds

Since then the actual feed definitions have not been visible/configurable,
as only /etc/opkg.conf has been visible in Luci.

This patch restores the capability to see and edit package feed definitions.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit a42c0bb6182fdde7591d1f1b163a9a3354b45f5a)

4 years agofor-15.05 luci-app-firewall: use maxlength datatype for zone name validation
Hannu Nyman [Sat, 26 Sep 2015 17:33:46 +0000 (20:33 +0300)]
for-15.05 luci-app-firewall: use maxlength datatype for zone name validation

Backport from trunk the zonename validation using
a compound datatype "and(uciname,maxlength(14))"

fw3 sets the maximum length of the zone name to 14 and
ignores zone definitions with too long names.
Add a simple validation to ensure that the new zone name is short enough.

Backport of 34e875b3 and edc58332

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoMerge pull request #486 from dwmw2/for-15.05
Jo-Philipp Wich [Tue, 22 Sep 2015 21:04:34 +0000 (23:04 +0200)]
Merge pull request #486 from dwmw2/for-15.05

luci/statistics: Fix nut UPS graphs

5 years agoluci/statistics: Fix nut UPS graphs 486/head
David Woodhouse [Thu, 17 Sep 2015 10:35:38 +0000 (11:35 +0100)]
luci/statistics: Fix nut UPS graphs

At some point since I last checked, the nut plugin for collectd changed the
names of the timeleft and percent datasets. Update the luci module to match
so that those graphs are generated correctly again.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
(cherry picked from commit 41ec4c68adf7e6545aa10b359fea1883bec79b3e)

5 years agoMerge pull request #474 from hnyman/entropy-1505 476/head
Hannu Nyman [Tue, 15 Sep 2015 07:51:42 +0000 (10:51 +0300)]
Merge pull request #474 from hnyman/entropy-1505

for-15.05 statistics: Backport entropy support, config cleanup, init scripts cleanup

5 years agostatistics: remove references to Lucid from scripts 474/head
Hannu Nyman [Sun, 30 Aug 2015 11:00:29 +0000 (14:00 +0300)]
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>
(cherry picked from commit 0d5070c51089deb448476f1abadcea8e185eaf9b)

5 years agostatistics: adjust default settings to match default plugins
Hannu Nyman [Sat, 29 Aug 2015 08:15:39 +0000 (11:15 +0300)]
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>
(cherry picked from commit 4f429c5c8d95bdd74a7e005364cb511410caea5e)

5 years agostatistics: cleanup config file
Hannu Nyman [Sat, 29 Aug 2015 07:59:01 +0000 (10:59 +0300)]
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>
(cherry picked from commit 6a4226b3d1cd71e5d3abd7219552aa7fb9dd6f65)

5 years agofor-15.05 statistics: Add support for entropy stats
Hannu Nyman [Tue, 15 Sep 2015 07:09:57 +0000 (10:09 +0300)]
for-15.05 statistics: Add support for entropy stats

Backport the addition of statistics on the available entropy
from 7df0df48c006bbe3a8f4f73cd7b0bdc9bec0f80e

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
5 years agoLuci opkg/packages: Limit version string display to 26 chars
Hannu Nyman [Sat, 5 Sep 2015 08:24:37 +0000 (11:24 +0300)]
Luci opkg/packages: Limit version string display to 26 chars

Many packages currently include a git commit hash in version string.
That makes version strings very long and the version column takes much space
when listing available/installed packages in Luci.

Longest version string is 58 characters (micropython).
85 packages have at least 50 chars and 150 packages at least 40 chars.

Adjust Luci to display max. 26 characters (= luci's own version string).

Longer version strings are cut to: "first 21c" + ".." + "last 3c"

The last 3 chars are used to preserve the possible PKG_REVISION string.
E.g. 'opkg' has only hash+PKG_REVISION, so using only start of the string
might not be optimal.

Examples:

1.3.10-20150302-f2a889564b3a215902622b040a1247af38cb8203-1
1.3.10-20150302-f2a88..3-1

0.1-20150302-654c7d288603f7dae09eb09b57fb67b38c7ac6c3-1
0.1-20150302-654c7d28..3-1

9c97d5ecd795709c8584e972bfdf3aee3a5b846d-7
9c97d5ecd795709c8584e..d-7

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(backport of commit ca75918ff3a9069d9e31fd0a0742ad5be1089309)