project/luci.git
11 months agoMerge pull request #6700 from lvoegl/pr/20231021-luci-app-strongswan
Paul Donald [Sun, 17 Dec 2023 23:42:13 +0000 (00:42 +0100)]
Merge pull request #6700 from lvoegl/pr/20231021-luci-app-strongswan

Signed-off-by: Lukas Voegl <lvoegl@tdt.de>
luci-app-strongswan-swanctl: initial commit
(cherry picked from commit 828716ad73be81079ffdaa1592f637efa1747f31)

11 months agoMerge pull request #6770 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Fri, 15 Dec 2023 21:48:27 +0000 (14:48 -0700)]
Merge pull request #6770 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: bugfix: remove instance selection

11 months agoluci-app-adblock-fast: bugfix: remove instance selection for some smartdns options 6770/head
Stan Grishin [Fri, 15 Dec 2023 13:35:35 +0000 (13:35 +0000)]
luci-app-adblock-fast: bugfix: remove instance selection for some smartdns options

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 97201f8379b5c3237420bf0363263a74a01c6e69)

11 months agoMerge pull request #6768 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Fri, 15 Dec 2023 06:04:19 +0000 (23:04 -0700)]
Merge pull request #6768 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: update to 1.1.1-1

11 months agoluci-app-adblock-fast: update to 1.1.1-1 6768/head
Stan Grishin [Fri, 15 Dec 2023 02:47:28 +0000 (02:47 +0000)]
luci-app-adblock-fast: update to 1.1.1-1

* Final (hopefully) attempt to avoid errors if dhcp/smartdns configs are
  missing
* New user experience for picking dnsmasq/smartdns instances to enable the
  adblocking on
* use function from init script to set up output paths
* update paths to run-time files in ACL

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 8d8ca1c6aace056dbcf4216ca797902c0099c2fb)

11 months agoluci-app-ddns: rename retry_count -> retry_max_count
Paul Donald [Tue, 12 Dec 2023 14:32:56 +0000 (15:32 +0100)]
luci-app-ddns: rename retry_count -> retry_max_count

syncs with openwrt/packages@e3292e4

Also fixes some i18n strings

Closes issue #6752

(cherry picked from commit d349181aaef50e7a545d784176e55f5dc70fabff)

11 months agoMerge pull request #6763 from stangri/openwrt-23.05-luci-app-https-dns-proxy
Stan Grishin [Mon, 11 Dec 2023 22:46:30 +0000 (15:46 -0700)]
Merge pull request #6763 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: update to 2023-10-25-5

11 months agoluci-app-https-dns-proxy: update to 2023-10-25-5 6763/head
Stan Grishin [Mon, 11 Dec 2023 13:06:12 +0000 (13:06 +0000)]
luci-app-https-dns-proxy: update to 2023-10-25-5

* no longer "require uci" in js files
* use L.resolveDefault when loading configs
* improve DNSMASQ config update selection user experience
* switch from uci.get to L.uci.get
* small code improvement of RPCD script

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 799280877fbe7a43dab9c3af1dd509519e2f542b)

11 months agoMerge pull request #6760 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Mon, 11 Dec 2023 10:40:59 +0000 (03:40 -0700)]
Merge pull request #6760 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: improve dnsmasq/smartdns instances selection

11 months agoluci-app-adblock-fast: improve dnsmasq/smartdns instances selection 6760/head
Stan Grishin [Mon, 11 Dec 2023 01:03:00 +0000 (01:03 +0000)]
luci-app-adblock-fast: improve dnsmasq/smartdns instances selection

* create UI elements with an option to pick multiple instances for
  dnsmasq and smartdns

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 061a5dc40487fbe63e4ce2314b3c95e0293c1a4e)

11 months agoMerge pull request #6757 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Sat, 9 Dec 2023 21:50:44 +0000 (14:50 -0700)]
Merge pull request #6757 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: bugfix: L.uci.load

11 months agoluci-app-adblock-fast: bugfix: L.uci.load 6757/head
Stan Grishin [Sat, 9 Dec 2023 13:43:05 +0000 (13:43 +0000)]
luci-app-adblock-fast: bugfix: L.uci.load

* fix app not working on systems without smartdns
* fix smartdns instances selection dependencies

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 0473939fff65384badf6d15f30a0e236f2110b3c)

11 months agoluci-mod-network: exclude alias to self from device picker
Jo-Philipp Wich [Fri, 8 Dec 2023 12:01:13 +0000 (13:01 +0100)]
luci-mod-network: exclude alias to self from device picker

Do not present alias to self as valid choice in the interface device picker.

Fixes: #6754
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 864bf25244a073bf85272524cd90df0a41629577)

11 months agoluci-mod-network: properly reflect config state in sysfs tristates
Jo-Philipp Wich [Fri, 8 Dec 2023 11:38:51 +0000 (12:38 +0100)]
luci-mod-network: properly reflect config state in sysfs tristates

When a boolean sysfs option is forcibly set to `0` or `1` in uci, then make
sure to properly reflect that choice state when rendering the widget.

Right now the dropdown incorrectly reverted to "automatic" after saving but
not applying the changes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4b6b00927b4a1076ed8bf23f3a0327a335ebece5)

11 months agoluci-mod-network: Rework the (multi) mac for static leases text
Paul Donald [Thu, 7 Dec 2023 00:06:16 +0000 (01:06 +0100)]
luci-mod-network: Rework the (multi) mac for static leases text

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 6bdc5771095627889d43a1cbdc4fc45e3b0e5537)

11 months agoluci-mod-network: Remove spurious linefeed
Paul Donald [Fri, 8 Dec 2023 01:50:35 +0000 (02:50 +0100)]
luci-mod-network: Remove spurious linefeed

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit ab95f8a61835376e670a04d8995212959540d0ad)

11 months agoluci-mod-network: Rework address helptext for DHCP
Paul Donald [Thu, 7 Dec 2023 03:09:39 +0000 (04:09 +0100)]
luci-mod-network: Rework address helptext for DHCP

Ease translators lives.

This introduces the function customi18n for positional string variables.

Word and grammatical ordering of some languages breaks guarantees for
positional string arguments.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit e05ee9389735683bf277d962d2bb9ba1908bdf13)

11 months agoluci-mod-network: Rework match_tag helptext for static leases
Paul Donald [Thu, 7 Dec 2023 00:29:17 +0000 (01:29 +0100)]
luci-mod-network: Rework match_tag helptext for static leases

Evidently, not all translators get it right.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 175a94325017964cc6e7e803c753399362c8b85f)

11 months agoluci-mod-status: add ACL entry for storage index
Christian Marangi [Thu, 15 Jun 2023 16:52:55 +0000 (18:52 +0200)]
luci-mod-status: add ACL entry for storage index

Add missing ACL entry for storage index page.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
luci-mod-status: expand storage index page with mount points

Expand storage index page with mount points. For custom mounts point we
use the device name and we reference the mount point between ().

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
luci-mod-status: ensure each storage getMountPoints result is unique

Signed-off-by: Paul Donald <newtwen@gmail.com>
Closes #2767

(cherry picked from commit f1db42e67041d7c290fb2221ba5e787aa5e6b8bb)

11 months agoMerge pull request #6749 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Wed, 6 Dec 2023 15:40:50 +0000 (08:40 -0700)]
Merge pull request #6749 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: sync with principal package

11 months agoluci-app-adblock-fast: sync with principal package 6749/head
Stan Grishin [Wed, 6 Dec 2023 10:27:01 +0000 (10:27 +0000)]
luci-app-adblock-fast: sync with principal package

* add support for smartdns ipset/nftset-based blocking

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 4c3cdcb68e8fec3969d2dec73714e1f11c1c749c)

11 months agoMerge pull request #6743 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Wed, 6 Dec 2023 10:08:13 +0000 (03:08 -0700)]
Merge pull request #6743 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: update to 1.1.0-1

11 months agoluci-app-vnstat2: fix configuration page when database is empty (#6746)
Jan Hoffmann [Wed, 6 Dec 2023 01:24:25 +0000 (02:24 +0100)]
luci-app-vnstat2: fix configuration page when database is empty (#6746)

The output of the command "vnstat --dbiflist 1" is empty when there are
no interfaces in the database. Add a check to avoid a "result.stdout is
undefined" error in that case.

Ref: https://forum.openwrt.org/t/error-in-luci-vnstat2-configuration-menu/179700
Fixes: 3ac4f567dfdf ("luci-app-vnstat2: use more efficient way to get database interfaces")
Signed-off-by: Jan Hoffmann <jan@3e8.eu>
(cherry picked from commit c0c37903f2276224c246c2a5ba0fb2732ba0e18a)

11 months ago[23.05] backport "luci-app-attendedsysupgrade: add x86 efi/bios case" (#6623)
Mathew McBride [Tue, 5 Dec 2023 14:12:03 +0000 (01:12 +1100)]
[23.05] backport "luci-app-attendedsysupgrade: add x86 efi/bios case" (#6623)

* luci-app-attendedsysupgrade: add x86 efi/bios case

x86 is the only target that allows you to install either EFI or BIOS
images, thereby add an extra check for that.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit d7e905e83a11d59ea217cd37189040bd6c9d403e)

* luci-app-attendedsysupgrade: fix search for x86 target

The conditional is wrong. IndexOf returns a number and not true/false,
so it does not work.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 021c4394871e062964e1601775f4c951d0e2b878)

---------

Co-authored-by: Paul Spooren <mail@aparcar.org>
Co-authored-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
11 months agoluci-app-adblock-fast: update to 1.1.0-1 6743/head
Stan Grishin [Tue, 5 Dec 2023 08:26:34 +0000 (08:26 +0000)]
luci-app-adblock-fast: update to 1.1.0-1

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 8db9af146acc0e4d5a0aa026636943d3f28468f2)

11 months agoluci-app-tinyproxy: support socks5 upstream (#6303)
[Tue, 5 Dec 2023 03:23:32 +0000 (11:23 +0800)]
luci-app-tinyproxy: support socks5 upstream (#6303)

Signed-off-by: Zhang Rui <rui.crater@gmail.com>
(cherry picked from commit fd2d2ac734429a81c9289e33635f28367a97fafe)

luci-app-tinyproxy: error check socks5 upstream (#6303)

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit b3d1d056f471f82ffc931a5cffef125ce36b6d41)

11 months agoMerge pull request #6574 from innovara/patch-1
Paul Donald [Mon, 4 Dec 2023 15:16:04 +0000 (16:16 +0100)]
Merge pull request #6574 from innovara/patch-1

Fix ATM HEC label on stats.js

(cherry picked from commit 1e84a03932455e79880e10abc88b92343db8d811)

11 months agoAdding a DNS option to the wireguard peer config generator.
Nicholaos Mouzourakis [Wed, 19 Apr 2023 04:24:00 +0000 (00:24 -0400)]
Adding a DNS option to the wireguard peer config generator.
Some clients like iOS require this explicitly, and so this change
adds the appropriate config with some sensible defaults.

Closes #6351

Signed-off-by: Nicholaos Mouzourakis <nevumx@gmail.com>
Signed-off-by: Paul Donald <newtwen@gmail.com>
Tested-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 990696d73f982de015df7c7d552daef1a03f50c5)
(cherry picked from commit 5b26887c52097dc9364c9b4f4dfb2d6ba2f08818)

11 months agoMerge pull request #6352 from nevumx/add-wireguard-peer-addresses-config
Paul Donald [Mon, 4 Dec 2023 16:34:40 +0000 (17:34 +0100)]
Merge pull request #6352 from nevumx/add-wireguard-peer-addresses-config

luci-proto-wireguard: adding an Addresses option to the wireguard peer config generator
(cherry picked from commit 9d746c75f4023bf3c4bcfe77eaa394fbf0188d95)

11 months agoluci-proto-sstp: add support for custom port (#6634)
Vladislav Grigoryev [Mon, 4 Dec 2023 21:26:01 +0000 (00:26 +0300)]
luci-proto-sstp: add support for custom port (#6634)

Add support for connecting to a custom SSTP port.
See also: https://github.com/openwrt/packages/pull/22405

Signed-off-by: Vladislav Grigoryev <vg.aetera@gmail.com>
(cherry picked from commit 85ad07c59ee3ab82ac5b55732201d17e6cc3ab9c)

11 months agoluci-app-example: Update with more documentation, more examples (#6503)
Duncan Hill [Mon, 4 Dec 2023 21:12:28 +0000 (21:12 +0000)]
luci-app-example: Update with more documentation, more examples (#6503)

* luci-app-example: Update with more documentation, examples
* Update translations file
* Move more YAML support to .md file, improve README
* luci-app-example: Update with more documentation, examples
* luci-app-example: Fix missed call to load_sample_yaml
* Format with tabs by using jsbeautify

(cherry picked from commit 28f805b2e5f95e04515bd7d045a103cc3a366c2c)

11 months agoluci-proto-wireguard: Remove confirmation dialogue to generate keys (#6697)
Paul Donald [Mon, 4 Dec 2023 21:00:35 +0000 (22:00 +0100)]
luci-proto-wireguard: Remove confirmation dialogue to generate keys (#6697)

Quality of life improvements. Reduce click amounts.
LuCI batches all changes for user-review anyway.

Tested on 23.05.0

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit a5786b5f2f68596b2ea8441fc8ad8ad7cf2ce2a9)

11 months agoluci-lib-nixio: Fix add_luci_conffiles adding duplicate files (#6568)
Xiang W [Mon, 4 Dec 2023 20:48:19 +0000 (04:48 +0800)]
luci-lib-nixio: Fix add_luci_conffiles adding duplicate files (#6568)

* luci-lib-nixio: Fix add_luci_conffiles adding duplicate files

add_luci_conffiles does not check whether the file already exists
when adding the file, which may result in redundant backups in the
sysupgrade backup.

Signed-off-by: Xiang W <wxjstz@126.com>
(cherry picked from commit c2f679962ddf7f6545adacfcf3068370825c43a9)

11 months agoluci-app-tor: Manage tor-hs onion services (#6476)
Sergey Ponomarev [Mon, 4 Dec 2023 19:09:55 +0000 (21:09 +0200)]
luci-app-tor: Manage tor-hs onion services (#6476)

* luci-app-tor: Manage Onion services (tor-hs)

The tor-hs packages provides Tor Onion (Hidden) Services.
This is a good option to bypass NAT and have stable access to a router.

Later once the main Tor package gains a support of a Proxy/Bridge configuration.
We can add this to the same luci app as a different view.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 3283cb2ebdb3dbd8ae744125ecd577a0025d14ad)

11 months agoNew app: luci-app-sshtunnel for SSH tunnels (#6424)
Sergey Ponomarev [Mon, 4 Dec 2023 18:27:53 +0000 (20:27 +0200)]
New app: luci-app-sshtunnel for SSH tunnels (#6424)

* luci-app-sshtunnel: SSH tunnels

The app helps to configure SSH tunnels.
You can also generate an SSH key and see known hosts.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 7d14746ae88a83163a7e34daae70b264285bbe56)

11 months agoluci-app-statistics: regenerate graphs on window resize
Rani Hod [Mon, 2 Oct 2023 15:01:54 +0000 (18:01 +0300)]
luci-app-statistics: regenerate graphs on window resize

Currently graphs are redrawn only based on the refresh interval
(never or every 5/30/60 seconds).
Since the image size is calculated based on the window size,
redraw graphs (once) also after resizing the window.
This also captures window resize due to orientation change
(e.g., for mobile).
Since multiple resize events are fired when dragging the window
border, there is a 250ms delay for debouncing.

Signed-off-by: Rani Hod <rani.hod@gmail.com>
Tested-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 8fcd52f5130acd1a0738ff47f9bba2c9cc42e662)

11 months agoMerge pull request #6642 from vgaetera/dnsmasq-network-select
Paul Donald [Mon, 4 Dec 2023 15:04:24 +0000 (16:04 +0100)]
Merge pull request #6642 from vgaetera/dnsmasq-network-select

luci-mod-network: use network selector for dnsmasq instances
(cherry picked from commit aa1e049f3600f68cf2f52d8a1eb092155bfe8d8a)

11 months agoMerge pull request #6651 from jjm2473/upstream/dockerman-hide-submit-on-overview
Paul Donald [Mon, 4 Dec 2023 14:06:17 +0000 (15:06 +0100)]
Merge pull request #6651 from jjm2473/upstream/dockerman-hide-submit-on-overview

luci-app-dockerman: hide config buttons in overview page
(cherry picked from commit 568b44edb3bf545e424e7c1a3f162e753b190113)

11 months agoMerge pull request #6525 from hingbong/issue-6524
Paul Donald [Mon, 4 Dec 2023 13:27:41 +0000 (14:27 +0100)]
Merge pull request #6525 from hingbong/issue-6524

luci-app-unbound: dns assist in zone-detail add 'unprotected-loop' option #6524
(cherry picked from commit e3466bd83be36bc1d62257fac3e1635fe18133ba)

11 months agoMerge pull request #6734 from felagund/patch-1
Paul Donald [Mon, 4 Dec 2023 13:05:36 +0000 (14:05 +0100)]
Merge pull request #6734 from felagund/patch-1

 luci-mod-network: Update wireless.js to clarify Distance Optimization

(cherry picked from commit 647019cc160c394800db32ce82895245adc302ee)

11 months agoMerge pull request #6711 from systemcrash/dns_nitpick
Paul Donald [Mon, 4 Dec 2023 04:16:40 +0000 (05:16 +0100)]
Merge pull request #6711 from systemcrash/dns_nitpick

luci-mod-network: nitpick of CNAME, MX, SRV syntax formatting
(cherry picked from commit d179d789e5f0542fd17eb2fd591909754c200d86)

11 months agoMerge pull request #6712 from systemcrash/discard_text
Paul Donald [Mon, 4 Dec 2023 04:16:23 +0000 (05:16 +0100)]
Merge pull request #6712 from systemcrash/discard_text

luci-mod-network: Extend helptext for RFC1918 rebind_protection
(cherry picked from commit d75626efcdf322a2c16559c11d5a53bab6dbd8a3)

11 months agoMerge pull request #6706 from vgaetera/fw-redirect-any
Paul Donald [Mon, 4 Dec 2023 04:13:33 +0000 (05:13 +0100)]
Merge pull request #6706 from vgaetera/fw-redirect-any

luci-app-firewall: allow redirects using ip family any
(cherry picked from commit 3633bea613d47a04053f0ed4d117629d8d7b7fbe)

11 months agoMerge pull request #6579 from systemcrash/fix_dnsmasq_instance_fields
Paul Donald [Mon, 4 Dec 2023 03:51:03 +0000 (04:51 +0100)]
Merge pull request #6579 from systemcrash/fix_dnsmasq_instance_fields

luci-mod-network: Fix 'instances' fields for dnsmasq dhcp config entries
(cherry picked from commit d353bc50cd45bd0863170a0fa2f4e474405f8354)

11 months agoMerge pull request #6400 from vintas/patch-2
Paul Donald [Mon, 4 Dec 2023 02:56:59 +0000 (03:56 +0100)]
Merge pull request #6400 from vintas/patch-2

docs: fix Client side JS API docs link
(cherry picked from commit 6ddbb30ac360393a69bfc4c0566b32bd23d9bcd0)

11 months agoMerge pull request #6386 from egc112/egc112-openvpn-advanced-lua
Paul Donald [Mon, 4 Dec 2023 02:55:27 +0000 (03:55 +0100)]
Merge pull request #6386 from egc112/egc112-openvpn-advanced-lua

openvpn-advanced.lua request to add OpenVPN data-ciphers

(cherry picked from commit 1c5ebc2a0c635130bd4f86f65dce29a686eb24c4)

11 months agoMerge pull request #6296 from jjm2473/patch-2
Paul Donald [Mon, 4 Dec 2023 02:44:24 +0000 (03:44 +0100)]
Merge pull request #6296 from jjm2473/patch-2

luci-theme-bootstrap: set scroll-margin-top for all elements
(cherry picked from commit 16470a0ab89c7bcde66e9ce7334d8e4d0a4265d0)

11 months agoMerge pull request #6295 from jjm2473/patch-1
Paul Donald [Mon, 4 Dec 2023 02:44:10 +0000 (03:44 +0100)]
Merge pull request #6295 from jjm2473/patch-1

luci-mod-status: fix iptables jump on argon theme
(cherry picked from commit 706668243b8617d5c5529ac76e54f84dc57203e3)

11 months agoMerge pull request #6216 from ne20002/luci-app-crowdsec-firewall-bouncer
Paul Donald [Mon, 4 Dec 2023 02:36:08 +0000 (03:36 +0100)]
Merge pull request #6216 from ne20002/luci-app-crowdsec-firewall-bouncer

luci-app-crowdsec-firewall-bouncer: new app
(cherry picked from commit dd3f5c65470c62ae977de047e975138195bf45e6)

luci-app-crowdsec-firewall-bouncer: add newline correction

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit e4dc88d875bbb63c90b71888d106b767e907140c)

11 months agoMerge pull request #5631 from coudu/luci-app-nut-fixes
Paul Donald [Mon, 4 Dec 2023 01:47:50 +0000 (02:47 +0100)]
Merge pull request #5631 from coudu/luci-app-nut-fixes

luci-app-nut: nut-monitor fixes
(cherry picked from commit 51a7e0b8e8db3709feccfa83176ae77372b2b1e7)

11 months agoMerge pull request #5520 from acooler15/luci-lib-docker
Paul Donald [Mon, 4 Dec 2023 01:38:32 +0000 (02:38 +0100)]
Merge pull request #5520 from acooler15/luci-lib-docker

luci-lib-docker: fix chunked decode
(cherry picked from commit 4ade6bd04c6fb29203ade9cb44ecd37ab465a2d6)

11 months agoluci-proto-modemmanager: Added logging level option and debugmode
Paul Donald [Mon, 4 Dec 2023 00:16:15 +0000 (01:16 +0100)]
luci-proto-modemmanager: Added logging level option and debugmode

Merge github.com:valexi7/luci PR #4328

Signed-off-by: Paul Donald <newtwen@gmail.com>
Signed-off-by: valexi7 <44439515+valexi7@users.noreply.github.com>
(cherry picked from commit 1731fe12b512e10b9c061114d348cd4872422c7a)

11 months agoMerge pull request #6689 from yggdrasil-openwrt/yggdrasil-2023-11-11
Jo-Philipp Wich [Thu, 30 Nov 2023 23:37:22 +0000 (00:37 +0100)]
Merge pull request #6689 from yggdrasil-openwrt/yggdrasil-2023-11-11

luci-proto-yggdrasil: yggdrasil now supported by netifd
(cherry picked from commit ab3f8254753d18935b1f6d8d015709613b3990a1)

11 months agoMerge pull request #6690 from yggdrasil-openwrt/rip-luci-app-yggdrasil
Paul Donald [Mon, 4 Dec 2023 12:29:06 +0000 (13:29 +0100)]
Merge pull request #6690 from yggdrasil-openwrt/rip-luci-app-yggdrasil

luci-app-yggdrasil: remove package in favor of luci-proto-yggdrasil
(cherry picked from commit 8b57cf00120d853318ad2f4f25a196a805f9714d)

11 months agoLuci-app-usteer: First version of luci-app-usteer
Ramon00 [Thu, 30 Nov 2023 15:43:34 +0000 (17:43 +0200)]
Luci-app-usteer: First version of luci-app-usteer

Signed-off-by: Ramon Van Gorkom <github@flightfoil.com>
[most trailing whitespace errors removed]
(cherry picked from commit a6753d44e7bcff305f789e182031fb5f089a8836)

11 months agoluci-proto-external: migrate from support to cni-protocol to external-protocol
Oskari Rauta [Thu, 30 Nov 2023 05:35:48 +0000 (07:35 +0200)]
luci-proto-external: migrate from support to cni-protocol to external-protocol

As previously introduced cni protocol support (for netifd) has evolved more
to a multipurpose protocol useful for cni/netavark/some vpn/etc connections
I have decided to rename it from cni-protocol to external-protocol.

That's why also it's luci companion, luci-proto-cni, should be renamed
to luci-proto-external and migrated to support external-protocol.

This patch also adds support for new option in external-protocol, delay.

This closes promise made in #22702 on openwrt packages repository.

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
(cherry picked from commit 0dd348c87f590861c252194b1720921d8779b4a1)

11 months agoMerge pull request #6626 from oskarirauta/luci-cni-protocol
Florian Eckert [Tue, 10 Oct 2023 05:57:59 +0000 (07:57 +0200)]
Merge pull request #6626 from oskarirauta/luci-cni-protocol

luci-proto-cni: protocol update
(cherry picked from commit 88d1893b9c21ce716d9bec4c40f6c9720becf220)

11 months agoMerge pull request #6719 from Moondarker/advanced-reboot-ver-bump
Stan Grishin [Fri, 24 Nov 2023 16:35:30 +0000 (09:35 -0700)]
Merge pull request #6719 from Moondarker/advanced-reboot-ver-bump

luci-app-advanced-reboot: bump version number due to changes in code
(cherry picked from commit 6f709303708e70cffff4ec6fd621df97325594bc)

11 months agoMerge pull request #6715 from systemcrash/32to64hostid
Jo-Philipp Wich [Wed, 22 Nov 2023 18:13:32 +0000 (19:13 +0100)]
Merge pull request #6715 from systemcrash/32to64hostid

11 months agoMerge pull request #6709 from Moondarker/mr90x-advanced-reboot
Stan Grishin [Mon, 20 Nov 2023 20:57:54 +0000 (13:57 -0700)]
Merge pull request #6709 from Moondarker/mr90x-advanced-reboot

luci-app-advanced-reboot: add support for Mercusys MR90X v1

11 months agoMerge pull request #6707 from ElbertMai/fix_vxlan6_ui
Jo-Philipp Wich [Sun, 19 Nov 2023 11:54:52 +0000 (12:54 +0100)]
Merge pull request #6707 from ElbertMai/fix_vxlan6_ui

11 months agoMerge pull request #6698 from vgaetera/route-defaults-fix
Jo-Philipp Wich [Sun, 19 Nov 2023 00:10:33 +0000 (01:10 +0100)]
Merge pull request #6698 from vgaetera/route-defaults-fix

luci-mod-network: fix route defaults

11 months agotreewide: Backport translations from master and sync
Hannu Nyman [Mon, 4 Dec 2023 20:32:43 +0000 (22:32 +0200)]
treewide: Backport translations from master and sync

Backport translations from master.
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
11 months agoluci-app-travelmate: typo fix
Dirk Brenken [Mon, 4 Dec 2023 20:21:33 +0000 (21:21 +0100)]
luci-app-travelmate: typo fix

* fixed an encryption description typo in the wireless stations overview

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 3e1d9786cc9382b759805aa27af549b11d8eebea)

12 months agoluci-mod-network: wireless.js: allow bridges for radius vlan tagged ifaces
Jo-Philipp Wich [Sun, 19 Nov 2023 00:06:56 +0000 (01:06 +0100)]
luci-mod-network: wireless.js: allow bridges for radius vlan tagged ifaces

Fixes: #6696
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 26e4b69abf0ce97197dea07b9e7c7f944b4c9e7c)

12 months agoluci-app-vnstat2: use more efficient way to get database interfaces
Jan Hoffmann [Sat, 18 Nov 2023 08:52:45 +0000 (09:52 +0100)]
luci-app-vnstat2: use more efficient way to get database interfaces

The currently used command "vnstat --json f 1" can be very slow when the
database contains many entries. This can result in an XHR timeout error
on the configuration page.

Use the "--dbiflist" option instead, which was added in vnStat 2.7.

Fixes: #6702
Signed-off-by: Jan Hoffmann <jan@3e8.eu>
(cherry picked from commit 3ac4f567dfdfd6ee989ceffb025241e605790b6d)

12 months agoluci-mod-status: nftables.js: fix translation of iif expression
Jo-Philipp Wich [Sat, 18 Nov 2023 23:58:08 +0000 (00:58 +0100)]
luci-mod-status: nftables.js: fix translation of iif expression

Fixes: https://github.com/openwrt/openwrt/issues/14003
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0b8f8ab075f89fc722bf5ef9ed0cfbf46219c5d6)

12 months agoluci-app-dawn: error message when service not running
Daniel Vijge [Mon, 6 Nov 2023 21:37:32 +0000 (22:37 +0100)]
luci-app-dawn: error message when service not running

Display a nicer error message when the DAWN service is not running

Signed-off-by: Daniel Vijge <danielvijge@gmail.com>
(cherry picked from commit 69eeebe23d60736c1d4436162444f7b9c53de3ed)

12 months agoMerge pull request #6693 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Mon, 13 Nov 2023 21:44:46 +0000 (14:44 -0700)]
Merge pull request #6693 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: sync version with principal package

12 months agoluci-app-adblock-fast: sync version with principal package 6693/head
Stan Grishin [Mon, 13 Nov 2023 10:06:28 +0000 (10:06 +0000)]
luci-app-adblock-fast: sync version with principal package

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 69eff2535ed25e55f2c62450790f4abd64710e42)

12 months agoluci-app-statistics: harden sysupgrade_backup
John Kohl [Sat, 11 Nov 2023 16:19:58 +0000 (11:19 -0500)]
luci-app-statistics: harden sysupgrade_backup

Remove sysupgrade_backup from help.  Also have it check parameters.

Signed-off-by: John Kohl <jtk.git@bostonpog.org>
(cherry picked from commit 55e0f28b1ec2f86068d1dad9915641e3fb22afbf)

12 months agoluci-app-statistics: cleanups of bad spacing
John Kohl [Sat, 11 Nov 2023 02:11:02 +0000 (21:11 -0500)]
luci-app-statistics: cleanups of bad spacing

Signed-off-by: John Kohl <jtk.git@bostonpog.org>
(cherry picked from commit 465bfe24fa89703d073e6830a36a5e8eedc8e4b0)

12 months agoluci-app-statistics: Add backup/restore for RRD statistics
John Kohl [Sat, 11 Nov 2023 11:15:16 +0000 (13:15 +0200)]
luci-app-statistics: Add backup/restore for RRD statistics

Add a backup/restore capability for rrd data storage in
luci_statistics.  The data storage is typically in /tmp and does not
survive reboot or sysupgrade.  This adds an option for the
administrator to configure the RRD plugin, so that the RRD data are
are preserved with a backup copy in the overlay file system.

This works for shutdown/reboot, sysupgrade (backup config files,
restore config files, and true sysupgrade).

Also fix a bug where starting luci_statistics for the first time would
not get a restart a running collectd: during install of the package
when it is not included in the base flashed image, collectd might be
started when it got installed/configured before this package gets
installed/configured.  So we need to check if it's running, and
restart it to use the luci_statistics configuration.

Signed-off-by: John Kohl <jtk.git@bostonpog.org>
(cherry picked from commit ad98af3a2be6c87b1f36cec05c8c3529831b7787)

12 months agoMerge pull request #6685 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Fri, 10 Nov 2023 19:48:42 +0000 (12:48 -0700)]
Merge pull request #6685 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: sync with adblock-fast 1.0.1-1

12 months agoluci-app-banip: sync with banIP 0.9.2-1
Dirk Brenken [Fri, 10 Nov 2023 18:12:40 +0000 (19:12 +0100)]
luci-app-banip: sync with banIP 0.9.2-1

* add the new logfile location option
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit b23b00e47800a261e7b6ff32ff66a0618a5aaadf)
Signed-off-by: Dirk Brenken <dev@brenken.org>
12 months agoluci-mod-network: add missing `throw` route type
Jo-Philipp Wich [Thu, 9 Nov 2023 15:32:54 +0000 (16:32 +0100)]
luci-mod-network: add missing `throw` route type

Ref: https://forum.openwrt.org/t/x/177040
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b423b4bbcf21d60fd32239699941249ed9c8b7aa)

12 months agoluci-app-adblock-fast: sync with adblock-fast 1.0.1-1 6685/head
Stan Grishin [Wed, 8 Nov 2023 10:01:15 +0000 (10:01 +0000)]
luci-app-adblock-fast: sync with adblock-fast 1.0.1-1

* improve error/warning/status messaging
* trim rpcd script code from functions shared with principal package
* depends on https://github.com/openwrt/packages/pull/22619

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit ced38d8fc1d70b0a27dcbd2d567686248e1fbfb3)

12 months agoluci-lib-ip: fix creating address instances from integers
Jo-Philipp Wich [Tue, 7 Nov 2023 21:59:08 +0000 (22:59 +0100)]
luci-lib-ip: fix creating address instances from integers

Ensure that the proper byte order is used when creating IPv4/IPv6/MAC
instances from integer values on big endian systems.

Fixes: #6678
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit ac7b37ef0133ab8349c8516d5a63a57a44dddafd)

12 months agoluci-app-opkg: fix sorting by size column
Jo-Philipp Wich [Tue, 7 Nov 2023 20:59:25 +0000 (21:59 +0100)]
luci-app-opkg: fix sorting by size column

Fixes: #6120
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 63e5d38db02fa18dd471e974d1410a454e0aa086)

12 months agoluci-app-dawn: Bug fixes for JavaScript implementation
Daniel Vijge [Sun, 5 Nov 2023 20:17:33 +0000 (21:17 +0100)]
luci-app-dawn: Bug fixes for JavaScript implementation

Some bug fixes and a small improvements that were discovered after the
initial implementation of the JavaScript version of luci-app-dawn:

* Correctly show multiple APs per client in the hearing map
* Display correct name of all APs in the hearing map
* Show if client is connected to the network in the hearing map. This
  replaces the column for Stations Connected, which is not a property
  of a client but of an AP, and is available still in the network overview.
* Display both hostname and MAC address for clients/APs
* Convert spaces to tabs in dawn-common.js for consistency

Signed-off-by: Daniel Vijge <danielvijge@gmail.com>
(cherry picked from commit e8029b08287c666a43d5ef25c7ea83ce7d606903)

12 months agoluci-mod-status: 29_ports.js: mute zone colors for disconnected ports
Jo-Philipp Wich [Thu, 2 Nov 2023 14:29:16 +0000 (15:29 +0100)]
luci-mod-status: 29_ports.js: mute zone colors for disconnected ports

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9d5e205b669431a1fc9a943de09babc42824128c)

12 months agotreewide: sync and merge master translations
Jo-Philipp Wich [Thu, 2 Nov 2023 11:05:43 +0000 (12:05 +0100)]
treewide: sync and merge master translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
12 months agoluci-mod-network: grammar fixes
Paul Dee [Fri, 11 Aug 2023 11:34:45 +0000 (13:34 +0200)]
luci-mod-network: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit d48979217c0b521d0e9d97090cf26c8e7941fa54)

12 months agoluci-app-siitwizard: grammar fixes
Paul Dee [Sat, 5 Aug 2023 00:09:22 +0000 (02:09 +0200)]
luci-app-siitwizard: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 28e7201bcb547fed70c0b3dd9c64fe88d6d37d78)

12 months agoluci-proto-wireguard: grammar fixes
Paul Dee [Fri, 11 Aug 2023 11:12:26 +0000 (13:12 +0200)]
luci-proto-wireguard: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 992cca55ae3d6599d177bdb3b9bfc2b679c650e5)

12 months agoluci-app-attendedsysupgrade: grammar fixes
Paul Dee [Sat, 5 Aug 2023 00:04:17 +0000 (02:04 +0200)]
luci-app-attendedsysupgrade: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 987ae1abb86528e6acf6f80a418af6c49c7e2ea4)

12 months agoluci-app-statistics: grammar fixes
Paul Dee [Fri, 11 Aug 2023 11:09:17 +0000 (13:09 +0200)]
luci-app-statistics: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit d34e052811f23cb191a38a2170166a7d5e84a5c9)

12 months agoluci-mod-system: grammar fixes
Paul Dee [Sat, 5 Aug 2023 00:16:31 +0000 (02:16 +0200)]
luci-mod-system: grammar fixes

Login (n) -> Log (v) in

Logout (n) -> Log (v) out

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 677da57a28f10428eb99488afef8e068614d4ea6)

12 months agoluci-base: grammar fixes
Paul Dee [Sat, 5 Aug 2023 00:16:07 +0000 (02:16 +0200)]
luci-base: grammar fixes

Login (n) -> Log (v) in

Logout (n) -> Log (v) out

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 2c3018d426e7a8afe06b529075aa43df2f8096f8)

12 months agoluci-app-minidlna: move album covers to advanced tab
Sergey Ponomarev [Fri, 8 Sep 2023 09:31:54 +0000 (12:31 +0300)]
luci-app-minidlna: move album covers to advanced tab

Also remove o.default = o.enabled

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 2bedcdfa166a9fd6e9bbc873ca1a1d8843952cef)

12 months agoluci-app-dockerman: fix stats page always blank
Liangbin Lian [Thu, 26 Oct 2023 11:48:49 +0000 (19:48 +0800)]
luci-app-dockerman: fix stats page always blank

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(cherry picked from commit 0fbbed4a84fb49c968e3ad8a5b76bbf332f42f5c)

12 months agoluci-app-dockerman: fix typos
Felix Baumann [Sat, 2 Sep 2023 22:49:55 +0000 (00:49 +0200)]
luci-app-dockerman: fix typos

useage > usage

Signed-off-by: Felix Baumann <felix.bau@gmx.de>
(cherry picked from commit 6afe7d91e5ae22008314de46e65310c9cf660edc)

12 months agoluci-app-pagekitec: add missing ACL rules
Jo-Philipp Wich [Thu, 19 Oct 2023 22:31:50 +0000 (00:31 +0200)]
luci-app-pagekitec: add missing ACL rules

Fixes: #6615
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9b545a370be764351d1fde9bdde5a12deebf7f57)

12 months agoluci-mod-network: Static Leases improvements
Paul Dee [Tue, 1 Aug 2023 22:54:32 +0000 (00:54 +0200)]
luci-mod-network: Static Leases improvements

Under DHCP and DNS, Static Leases tab:
Add extra fields and booleans
Add 'ignore' value for ip field
Add description text for fields
Enable wildcards in mac addresses

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit f73abffa2aa64a91e6c16ddae7966a5c35e73fe1)

12 months agoluci-app-olsr-viz: migrate to js
Ayushman Tripathi [Thu, 13 Jul 2023 06:19:43 +0000 (11:49 +0530)]
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix tag

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix var name

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js use load for script & fix bugs

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix script

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix bugs

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix view

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js fix script

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js fix view

luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix script

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>
luci-app-olsr-viz: migrate to js
(cherry picked from commit 00cfca13b5cd01ee86194e3f859b81e1db475b8a)

12 months agoluci-theme-openwrt-2020: import bootstrap radio/checkbox styling rules
Jo-Philipp Wich [Wed, 26 Jul 2023 13:46:06 +0000 (15:46 +0200)]
luci-theme-openwrt-2020: import bootstrap radio/checkbox styling rules

Import the radio and checkbox styling rules from the default Bootstrap
theme and adapt colors and margins to the OpenWrt 2020 one.

Fixes: #6442
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7cded1f8bbbc85ea6ca57c515b9988130e85726f)

12 months agoluci-app-firewall: missing variable declaration
Sergey Ponomarev [Sat, 10 Jun 2023 18:51:09 +0000 (21:51 +0300)]
luci-app-firewall: missing variable declaration

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit b5ba9c3741d7e554463035e623b7d7e52c84d1fb)

12 months agoluci-base: ui.js: set `autocomplete="new-password"` for password fields
Jo-Philipp Wich [Wed, 7 Jun 2023 21:40:04 +0000 (23:40 +0200)]
luci-base: ui.js: set `autocomplete="new-password"` for password fields

Attempt to prevent Firefox from randomly filling nonesense into arbitrary
password fields such as the WireGuard private key field by setting the
`autocomplete="new-password"` attribute on any password type fields.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 23a246e4b4d0a0959d16a1add3868361b78f3021)

12 months agoluci-mod-dashboard: hide wireless pane when there are no radios
Rani Hod [Thu, 13 Apr 2023 08:45:03 +0000 (11:45 +0300)]
luci-mod-dashboard: hide wireless pane when there are no radios

Implements feature request #4472.

Signed-off-by: Rani Hod <rani.hod@gmail.com>
(cherry picked from commit b5836cd8252866a5d8993511bcd920b2bd3afe06)

12 months agoluci-mod-status: improve channel graph for 5GHz radio
Christian Marangi [Sun, 30 Jul 2023 21:03:20 +0000 (23:03 +0200)]
luci-mod-status: improve channel graph for 5GHz radio

Improve channel graph for 5GHz radio by using dotted lines to identify
the intermediate channel, full line to identify the different channel
band and bold line to identify the different section of the wifi
channels.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 69a8e4a98dd71ca7315684debc8e98eb273b03ef)