Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

luci-base: conversion of ucitrack handling from uci to json #7056

Merged
merged 33 commits into from
Apr 16, 2024
Merged

luci-base: conversion of ucitrack handling from uci to json #7056

merged 33 commits into from
Apr 16, 2024

Commits on Apr 11, 2024

  1. luci-base: use json for ucitrack instead of uci 

    The 'ucitrack' configuration under '/etc/config' defines which service must
be restarted on a LuCI change. This uci file defines how all this works
together. Additionally there are 'uci-defaults' scripts in the various
applications that add additional configurations parameters to this ucitrack
file if a service must be reloaded/restarted on a LuCI change.

There are some problems with the current implementation:

* The uci should be used to configure the system and not for this kind of
  reload/restart dependency handling on LuCI changes.
* On a system update with configuration restore of the 'ucitrack' file
  the new behavior on LuCI reload/restart could not take into account
  because the new file is *not* used.

This commit converts the handling from uci to json.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    a55b601 View commit details
    Browse the repository at this point in the history

  2. luci-base: delete unused luci-reload command 

    This script is no longer needed and can therefore be deleted.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    411e78f View commit details
    Browse the repository at this point in the history

  3. luci-app-ddns: remove uci-defaults for ucitrack handling 

    The 'ucitrack' file is not available anymore this changes is not needed.
Therefore, this 'uci-defaults' script is deleted.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    768f927 View commit details
    Browse the repository at this point in the history

  4. luci-app-privoxy: remove uci-defaults for ucitrack handling 

    The 'ucitrack' file is not available anymore this changes are not needed.
Therefore, this 'uci-defaults' script is deleted.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    0b36f26 View commit details
    Browse the repository at this point in the history

  5. luci-app-mwan3: remove uci-defaults for ucitrack handling 

    The 'ucitrack' file is not available anymore this changes are not needed.
Therefore, this 'uci-defaults' script is deleted.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    1 Configuration menu
    Copy the full SHA
    a69e387 View commit details
    Browse the repository at this point in the history

  6. luci-app-upnp: remove uci-defaults for ucitrack handling 

    The 'ucitrack' file is not available anymore this changes are not needed.
Therefore, this 'uci-defaults' script is deleted.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    6240628 View commit details
    Browse the repository at this point in the history

  7. luci-app-sqm: upgrade uci-defaults for ucitrack handling to use json 

    Conversion of the 'uci-defaults' script for ucitrack handling to the new
json processing.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    81b7e7d View commit details
    Browse the repository at this point in the history

  8. luci-app-polipo: upgrade uci-defaults for ucitrack handling to use json 

    Conversion of the 'uci-defaults' script for ucitrack handling to the new
json processing.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    a8c45d9 View commit details
    Browse the repository at this point in the history

  9. luci-app-olsr: upgrade uci-defaults for ucitrack handling to use json 

    Conversion of the 'uci-defaults' script for ucitrack handling to the new
json processing.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    9909aa4 View commit details
    Browse the repository at this point in the history

  10. luci-app-dynapoint: upgrade uci-defaults for ucitrack handling to use… 

    … json

Conversion of the 'uci-defaults' script for ucitrack handling to the new
json processing.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    15e355f View commit details
    Browse the repository at this point in the history

  11. luci-app-irqbalance: upgrade uci-defaults for ucitrack handling to us… 

    …e json

Conversion of the 'uci-defaults' script for ucitrack handling to the new
json processing.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    5320d96 View commit details
    Browse the repository at this point in the history

  12. luci-app-watchcat: upgrade uci-defaults for ucitrack handling to use … 

    …json

Conversion of the 'uci-defaults' script for ucitrack handling to the new
json processing.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    0be7f9d View commit details
    Browse the repository at this point in the history

  13. luci-app-libreswan: upgrade uci-defaults for ucitrack handling to use… 

    … json

Conversion of the 'uci-defaults' script for ucitrack handling to the new
json processing.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    dd0aa93 View commit details
    Browse the repository at this point in the history

  14. luci-app-p910nd: upgrade uci-defaults for ucitrack handling to use json 

    Conversion of the 'uci-defaults' script for ucitrack handling to the new
json processing.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    5c6fbba View commit details
    Browse the repository at this point in the history

  15. luci-app-ahcp: upgrade uci-defaults for ucitrack handling to use json 

    Conversion of the 'uci-defaults' script for ucitrack handling to the new
json processing.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    1d70d56 View commit details
    Browse the repository at this point in the history

  16. luci-app-radicale: remove uci-defaults for ucitrack handling 

    The 'ucitrack' file is not available anymore this changes are not needed.
Therefore, this 'uci-defaults' script is deleted.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    0806da7 View commit details
    Browse the repository at this point in the history

  17. luci-app-minidlna: remove uci-defaults for ucitrack handling 

    The 'ucitrack' file is not available anymore this changes are not needed.
Therefore, this 'uci-defaults' script is deleted.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    862c675 View commit details
    Browse the repository at this point in the history

  18. luci-base: remove deprecated ucitrack httpd.json 

    In the whole OpenWrt there is no httpd uci config, this must be a leftover
from before uhttpd and can therefore be deleted.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    c36ec4d View commit details
    Browse the repository at this point in the history

  19. luci-base: remove deprecated ucitrack ntpclient.json 

    In the whole OpenWrt there is no ntpclient uci config, this must be a
leftover and can therefore be deleted.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    d7300c5 View commit details
    Browse the repository at this point in the history

  20. luci-base: remove deprecated ucitrack olsr.json 

    In the whole OpenWrt there is no olsr uci config, this must be a leftover
and can therefore be deleted.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    ad73ffb View commit details
    Browse the repository at this point in the history

  21. luci-base: move and rename ucitrack tinyproxy.json 

    Move the json file to where it belongs.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    706d8af View commit details
    Browse the repository at this point in the history

  22. luci-base: move and rename ucitrack qos.json 

    Move the json file to where it belongs.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    bfe486e View commit details
    Browse the repository at this point in the history

  23. luci-base: move and rename ucitrack wireless.json 

    Move the json file to where it belongs.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    014b657 View commit details
    Browse the repository at this point in the history

  24. luci-base: move and rename ucitrack network.json 

    Move the json file to where it belongs.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    a197b80 View commit details
    Browse the repository at this point in the history

  25. luci-base: move and rename ucitrack samba.json 

    Move the json file to where it belongs.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    a26eefd View commit details
    Browse the repository at this point in the history

  26. luci-base: move and rename ucitrack fstab.json 

    Move the json file to where it belongs.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    c15b0bf View commit details
    Browse the repository at this point in the history

  27. luci-base: move and rename ucitrack upnp.json 

    Move the json file to where it belongs.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    5bc03b7 View commit details
    Browse the repository at this point in the history

  28. luci-base: move and rename ucitrack dhcp.json 

    Move the json file to where it belongs.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    4a95439 View commit details
    Browse the repository at this point in the history

  29. luci-base: move and rename ucitrack dropbear.json 

    Move the json file to where it belongs.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    e3c6eb2 View commit details
    Browse the repository at this point in the history

  30. luci-base: move and rename ucitrack firewall.json 

    Move the json file to where it belongs.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    cc44632 View commit details
    Browse the repository at this point in the history

  31. luci-base: move and rename ucitrack odhcpd.json 

    Move the json file to where it belongs.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    549cecb View commit details
    Browse the repository at this point in the history

  32. luci-base: move and rename ucitrack system.json 

    Move the json file to where it belongs.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    2967807 View commit details
    Browse the repository at this point in the history

  33. luci-base: move and rename ucitrack luci_splash.json 

    Move the json file to where it belongs.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
    @feckert
    feckert committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    4cffc9f View commit details
    Browse the repository at this point in the history