luci-app-nut: fix sync between LuCI and init.d parameters#8420
luci-app-nut: fix sync between LuCI and init.d parameters#8420usamanassir wants to merge 1 commit intoopenwrt:masterfrom
Conversation
Signed-off-by: Usama Nassir <usama.nassir@gmail.com>
Failed checksIssues marked with an ❌ are failing checks. Commit fe3bff6
For more details, see the full job log. Something broken? Consider providing feedback. |
|
@danielfdickinson does this agree? |
|
I think part of the problem may be incorrect values in the https://github.com/openwrt/packages version of nut. I would prefer to see a PR ensuring packages.git is correct before updating LuCI to match it. I've been rather busy, but if I am able to find some time, I will such a PR myself. |
|
@danielfdickinson, I simply matched the names to https://github.com/openwrt/packages/blob/master/net/nut/files/nut-monitor.init. |
Prompted by openwrt/luci#8420 (comment) we update upsmon configs to ensure they are correct according to upstream. We reorder the options so that they match upstream documentation at <https://networkupstools.org/docs/man/upsmon.conf.html> to be sure we have not missed any items. While at it, we add configuration options from the upsream documenation that are not currently present in the UCI configs. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
Prompted by openwrt/luci#8420 (comment) we update upsmon configs to ensure they are correct according to upstream. We reorder the options so that they match upstream documentation at <https://networkupstools.org/docs/man/upsmon.conf.html> to be sure we have not missed any items. While at it, we add configuration options from the upstream documentation that are not currently present in the UCI configs. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
Prompted by openwrt/luci#8420 (comment) we update upsmon configs to ensure they are correct according to upstream. We reorder the options so that they match upstream documentation at <https://networkupstools.org/docs/man/upsmon.conf.html> to be sure we have not missed any items. While at it, we add configuration options from the upstream documentation that are not currently present in the UCI configs. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
Prompted by openwrt/luci#8420 (comment) we update upsmon configs to ensure they are correct according to upstream. We reorder the options so that they match upstream documentation at <https://networkupstools.org/docs/man/upsmon.conf.html> to be sure we have not missed any items. While at it, we add configuration options from the upstream documentation that are not currently present in the UCI configs. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
|
@usamanassir I have created openwrt/packages#28875 which makes sure the names are correct from NUTs point of view. This PR should match that PR. I have also created #8434 to keep that part in sync. |
|
@danielfdickinson, wont (openwrt/packages#28875 break old nut instlattions. Meaning, once a working system gets the new version, it will stop working. |
Care was taken to prevent breaking old installations. Have you actually tried? If you have an installation that breaks, please provide configuration and logs of the broken configuration. Also please provide those comments on openwrt/packages#28875 |
Prompted by openwrt/luci#8420 (comment) we update upsmon configs to ensure they are correct according to upstream. We reorder the options so that they match upstream documentation at <https://networkupstools.org/docs/man/upsmon.conf.html> to be sure we have not missed any items. While at it, we add configuration options from the upstream documentation that are not currently present in the UCI configs. Some years ago upstream changed the names the primary/secondary UPS system/monitor from master/slave to primary/secondary. It is uncertain how much longer these deprecated names will be accepted by NUT. Therefore update naming to match upstream documentation and configuration. See <https://networkupstools.org/docs/man/upsmon.html>, <https://networkupstools.org/docs/man/upsmon.conf.html>, and <https://networkupstools.org/docs/man/upsd.users.html>. At the same time, prompted by openwrt#28875 (comment) we simplify the configuration and add checks to avoid bad configs due to misspellings/typos of configuation options by users. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
Prompted by openwrt/luci#8420 (comment) we update upsmon configs to ensure they are correct according to upstream. We reorder the options so that they match upstream documentation at <https://networkupstools.org/docs/man/upsmon.conf.html> to be sure we have not missed any items. While at it, we add configuration options from the upstream documentation that are not currently present in the UCI configs. Some years ago upstream changed the names the primary/secondary UPS system/monitor from master/slave to primary/secondary. It is uncertain how much longer these deprecated names will be accepted by NUT. Therefore update naming to match upstream documentation and configuration. See <https://networkupstools.org/docs/man/upsmon.html>, <https://networkupstools.org/docs/man/upsmon.conf.html>, and <https://networkupstools.org/docs/man/upsd.users.html>. At the same time, prompted by openwrt#28875 (comment) we simplify the configuration and add checks to avoid bad configs due to misspellings/typos of configuation options by users. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
Prompted by openwrt/luci#8420 (comment) we update upsmon configs to ensure they are correct according to upstream. We reorder the options so that they match upstream documentation at <https://networkupstools.org/docs/man/upsmon.conf.html> to be sure we have not missed any items. While at it, we add configuration options from the upstream documentation that are not currently present in the UCI configs. Some years ago upstream changed the names the primary/secondary UPS system/monitor from master/slave to primary/secondary. It is uncertain how much longer these deprecated names will be accepted by NUT. Therefore update naming to match upstream documentation and configuration. See <https://networkupstools.org/docs/man/upsmon.html>, <https://networkupstools.org/docs/man/upsmon.conf.html>, and <https://networkupstools.org/docs/man/upsd.users.html>. At the same time, prompted by openwrt#28875 (comment) we simplify the configuration and add checks to avoid bad configs due to misspellings/typos of configuation options by users. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
Prompted by openwrt/luci#8420 (comment) we update upsmon configs to ensure they are correct according to upstream. We reorder the options so that they match upstream documentation at <https://networkupstools.org/docs/man/upsmon.conf.html> to be sure we have not missed any items. While at it, we add configuration options from the upstream documentation that are not currently present in the UCI configs. Some years ago upstream changed the names the primary/secondary UPS system/monitor from master/slave to primary/secondary. It is uncertain how much longer these deprecated names will be accepted by NUT. Therefore update naming to match upstream documentation and configuration. See <https://networkupstools.org/docs/man/upsmon.html>, <https://networkupstools.org/docs/man/upsmon.conf.html>, and <https://networkupstools.org/docs/man/upsd.users.html>. At the same time, prompted by openwrt#28875 (comment) we simplify the configuration and add checks to avoid bad configs due to misspellings/typos of configuation options by users. A sample config config upsmon 'upsmon' option notifycmd '/usr/bin/logger -t nut-monitor-exec ' config monitor option type primary option upsname upsname option hostname localhost option username upsuser option password upspassword config notifications 'ONLINE' option message "UPS %s is on line power" option flag "SYSLOG" config notifications 'ONBATT' option message "UPS %s is on battery power" option flag "SYSLOG+EXEC" In order to iterate through the notifications, we use named 'notifications' sections and compare the section name to list of notification events defined by NUT. If they don't match, warn during initscript startup. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
openwrt/packages#28875 deals with openwrt#8420 (comment) and openwrt/packages#28875 (comment) by simplifying the configuration of notification messages and flags. At the same time it modernizes the monitoring user configuration. Supersedes openwrt#8434 This commit syncs luci-app-nut for the nut package changes in openwrt/packages#28875 . Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
|
@usamanassir I believe #8533 and the related openwrt/packages#28875 resolve the parameters names issue. |
|
Agree. Closing the PR. |
Signed-off-by: <my@email.address>row (viagit commit --signoff)<package name>: titlefirst line subject for packagesPKG_VERSIONin the Makefile