aboutsummaryrefslogtreecommitdiff
path: root/net/nut/files
Commit message (Collapse)AuthorAge
* nut: add cable type nut driver configRob J. Epping2022-05-13
| | | | | | | | | | at least driver apcsmart-old (maybe more) allow for specifying the type of cable used. My old UPS does will not function when cable type is not specified. This will add support for configuration option 'cable' Signed-off-by: Rob J. Epping <epping@renf.us>
* nut: refactor upssched uci-defaults scriptPascal Coudurier2022-01-11
| | | | | | | | | Add checks not to overwrite defaultnotify options in the nut-sendmail-notify fashion. Use lists for defaultnotify instead of option. Add check not to overwrite notifycmd if already defined. upssched-cmd script must not be called directly, it is called by the upssched binary with needed arguments. Signed-off-by: Pascal Coudurier <coudu@wanadoo.fr>
* nut: refactor nut-monitor uci config filePascal Coudurier2022-01-11
| | | | | | | | Convert notifyflags options to lists as supported by the init script, so multiple options can be chosen. Add SYSLOG default option to individuals notifyflags instead of deprecated flag 1|0. Add comment for defaultnotify and individuals notifyflags about possible values. Signed-off-by: Pascal Coudurier <coudu@wanadoo.fr>
* nut: fix typo in nut-monitor init scriptPascal Coudurier2022-01-11
| | | | | | This fixes a typo in the nut-monitor init script when building config file from uci config. Signed-off-by: Pascal Coudurier <coudu@wanadoo.fr>
* nut: Add the option to compile Nut NetXML drivers with the Nut package.Seb Belcher2021-09-23
| | | | | | Also modifies the nut-server init script to include options specific to the netxml driver. Signed-off-by: Seb Belcher <sdjbelcher@gmail.com>
* nut: fix typo in nutshutdown scriptSven Roederer2021-04-03
| | | | | | | | Even it's only cosmetic and should not affect the function of regular system, fix the name of the IPKG_INSTROOT variable. Typo was added long ago with 8400c9a6ec799. Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
* nut: fix _ handlingRosen Penev2020-09-19
| | | | | | Taken from https://github.com/openwrt/packages/issues/13359 Signed-off-by: Rosen Penev <rosenp@gmail.com>
* nut: fix other/otherflag custom variables in nut-server.initMatt Merhar2020-01-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows custom config parameters to be added to the generated config files, enabling the original intended functionality per https://openwrt.org/docs/guide-user/services/ups/software.nut. Example usage from /etc/config/nut_server: config driver 'apc' option driver 'snmp-ups' option snmp_version 'v3' option port '172.16.100.5' list other 'secLevel' list other 'secName' list other 'authPassword' list otherflag 'notransferoids' config other 'other_secLevel' option value 'authNoPriv' config other 'other_secName' option value 'some_username' config other 'other_authPassword' option value 'some_password' config other 'otherflag_notransferoids' option value '1' Signed-off-by: Matt Merhar <mattmerhar@protonmail.com>
* nut: Actually do FSD when requiredDaniel F. Dickinson2019-04-28
| | | | | | | | The code was all there but the call do the function containing it was missing, so call the function so that forced (UPS) shutdown occurs on a battery critical or manually requested FSD situation. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix nutmon issues with initDaniel F. Dickinson2019-04-28
| | | | | | | | | | | | | | | | NUT's upsmon is rather peculiar in that it has a child process that runs as a regular user and a parent process that runs as root (in order to facilitate shutting down the device if needed). procd doesn't deal well with this and doing 'normal' procd stop / restart / etc results in the child process still hanging around but with not parent, which causes undesired behaviour. Therefore, add the use of 'upsmon -c stop' during process shutdown / restart in order to ensure that upsmon is actually fully stopped. Also fixes nut-monitor going into crashloop on network changes (due to trigger that restarted upsmon but failed due to orphan child from before restart). Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: initscripts hotplug: Fix many small semantic issuesDaniel F. Dickinson2019-01-20
| | | | | | | | Small but important tweaks to fix the operation of the nut initscripts and hotplug scripts. All hail shellcheck and proofreading and dogfooding. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* Merge pull request #7910 from cshoredaniel/pr-nut-fsd-bugHannu Nyman2019-01-13
|\ | | | | nut: Prevent FSD when not specifically requested
| * nut: Prevent FSD when not specifically requestedDaniel F. Dickinson2019-01-08
| | | | | | | | | | | | | | | | | | Under certain circumstances nutshutdown was causing a forced shutdown of the UPS even though killpower was not indicated. Prevent that. Also clarify the logic for powering off server by avoiding && || chains. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* | nut: Fix procd crashloop no interfacesDaniel F. Dickinson2019-01-07
|/ | | | | | | Fix a crashloop under procd when attempting to bind to any address when no interfaces are yet available. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: really run upsd as non-rootDaniel F. Dickinson2018-12-23
| | | | | | | | | | | One local removal was missed in last push of this fix, so in certain circumstances upsd would run as root even when it shouldn't. Fixes f48b060fa752 ("nut: Fix upsd runs as root") Closes: #6697 (properly) Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Update server config comment 'docs'Daniel F. Dickinson2018-12-23
| | | | | | | Update the commented out settings in /etc/config/nut_server that shows the available sections with their default settings. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix additional (other) variable handlingDaniel F. Dickinson2018-12-20
| | | | | | | | | | There was a cut & paste error in the handling of 'other' variables (i.e. driver variables not specifically known to the package but which some users may require to be add). There was also a logic error from not switching sufficient after cut & paste. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Remove extraneous config readsDaniel F. Dickinson2018-12-20
| | | | | | | | Handling of driver variable defaults, overrides, and additional (other) variables changed and left behind some extraneous config reads (config_get and config_list_foreach). Remove those. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: alphabetize driver optionsDaniel F. Dickinson2018-12-20
| | | | | | | There are a lot of options; to make development easier alphabetize them. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Optionally set serial USB to NUT userDaniel F. Dickinson2018-12-06
| | | | | | | | | When using serial-port based UPSes with NUT, it is handy to be able to configure a USB serial port to have be set tot the NUT runas user, so that NUT can access the serial port automagically. Closes #6997 Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix upsd runs as rootDaniel F. Dickinson2018-12-06
| | | | | | | | | | Closes #6997 - Allows upsd to runas a non-privileged user. If any driver is running as non-privileged user, the last driver's user will be used as the server non-privileged user, otherwise the user specified in config upsd, otherwise nut. Previously the localisation of RUNAS variable was in the wrong locations. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix a typo in setting a driver parameterDaniel F. Dickinson2018-12-06
| | | | | | synchronous would not get set due to typo. Fixed. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix extraneous config_getDaniel F. Dickinson2018-11-19
| | | | | | nut-server initscript had a duplicate config_get statepath, so remove it Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix nut-cgi config creation (startup)Daniel F. Dickinson2018-11-19
| | | | Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix variables for NUT driversDaniel F. Dickinson2018-11-19
| | | | | | | | | Avoid specifying variables that are not specificy set in order to avoid breaking drivers for which those variables do not exist. Closes: #7096. As part of these fixes make sure we have all the variables we need. Closes: #7001. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Various startup fixes for monitor and serverDaniel F. Dickinson2018-11-19
| | | | | | | Various path and permissions fixes to properly allow nut-server and nut-monitor to start properly. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix checking for path before it existsDaniel F. Dickinson2018-11-19
| | | | | | | | The mechanism for making sure hotplug doesn't execute during forced shutdown was interfering with initial start of hotplug script due to checking for path that doesn't exist at initial start. This fixes that and closes #6966. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix undetected UPS hardwareDaniel F. Dickinson2018-11-19
| | | | | | | | Leading zeroes left in ProductId results in some UPS hardware not being matched by the hotplug script lead to bad permissions and driver not starting. Closes: #6966 Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Use quotes around filenamesDaniel F. Dickinson2018-08-29
| | | | | | | Avoid potential issues with space or other strangeness by quoting filenames through the initscripts. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Reduce user error with POWERDOWNFLAGDaniel F. Dickinson2018-08-29
| | | | | | | | | Instead of making POWERDOWNFLAG an uci option the user can only change it via initscript edits. This avoids chance for users to miss the required change to nut-driver when setting an UCI option for nut-monitor which results in failure to do FSD on the UPS. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Use diff non-privileged user for upsmonDaniel F. Dickinson2018-08-29
| | | | | | | | By default use a non-privileged user that is different than the server or driver (when they are running non-privileged). This is recommended by upstream. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Use 'real' procd for nut-cgiDaniel F. Dickinson2018-08-29
| | | | | | | | Even though nut-cgi doesn't run a daemon, using procd triggers is helpful for updating the generated config file when the UCI config changes. So implement this and 'modernize' nut-cgi initscript Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: nut-cgi: Add support for upssetDaniel F. Dickinson2018-08-29
| | | | | | | This allows config for setting variables and/or running commands from the CGI. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Make FSD really workDaniel F. Dickinson2018-08-29
| | | | | | | | Forced shutdown of the UPS was not actually happening before due to lack of specific commands doing the shutdown. This (and the nut-driver initscript) fix that. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Use 'real' procd init for nut-monitorDaniel F. Dickinson2018-08-29
| | | | | | | | | This fully procdifies nut-monitor, which fixes some issues with very slow restarts (due to /lib/functions/procd.sh using a very long delay for non-native scripts doing restart) as well as gives respawning, etc. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Add USB hotplug supportDaniel F. Dickinson2018-08-29
| | | | | | | | usbhid-ups has the necessary information in the source, so let's support USB hotplugging out of the box. Takes advantage of the procd support now in nut-server initscript. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Reorganize nut-server to clarify nut-driverDaniel F. Dickinson2018-08-29
| | | | | | | | | | | | | | | | | | Clarify the different between the common nut-driver portions of nut-server and the nut-server (upsd) proper. nut-driver can't be used without nut-server so there is no compelling reason to split into a separate package, but the reorganization makes such a move easier and makes it clear what each bit is for. While we continue to use a single initscript, it's a properly procdified one which handles the upsd daemon as a different instance than the driver instances. This resolves a race condition in which upsd and drivers fail to start do to a degree of interdepedence. Also properly 'procd'ifies the nut-server initscript. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* nut: Fix for nut-upsmon without nut-serverDaniel F. Dickinson2018-08-02
| | | | | | | | | nut-monitor failed to create required dir /var/etc/nut, as well as failing to set appropriate user on the directory and conf files. Fixing this closes https://github.com/openwrt/packages/issues/6644 Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
* net/nut: Fix '/var/run' world readable warningDaniel Dickinson2017-01-11
| | | | | | | | Use /var/run/nut as statepath and set appropriate owner and permissions on /var/run/nut in order to avoid pidfile for nut being world-readable. Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
* net-nut: Add UPS notifications via sendmailDaniel Dickinson2017-01-11
| | | | | | | Add option to send email notification via sendmail (or replacement). Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
* net/nut: Protect CGI via HTTP Basic AuthDaniel Dickinson2017-01-11
| | | | | | | When using uhttpd (the default), protect NUT CGI via HTTP Basic Auth. Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
* net/nut: Build optional separate packages and ucifyDaniel Dickinson2017-01-11
| | | | | | | | | | | | | With a LuCI app (of which I have one written) ucification makes sense (and is in fact needed), so ucify the initscripts. Also, rather than making selection of things to include an image a matter of selecting compile-time config options, make optional things into seperate packages that are built in default builds, and leave selection of what to include or not up to the user (e.g. using ImageBuilder, or adding packages via opkg). Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
* nut: add dev headers, nut-web-cgi and nut-avahi-service, bugfixMarty R2015-10-03
| | | | | | | | | | | | | | | | | Headers are required by collectd as mentioned in #1801. This is the nut portion based on dwmw2@d636841cd1d1dfab04cb509520c082738ddfb2ea Happy to merge with 15.05 as per #1803. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> [martin.p.rowe@gmail.com: condensed InstallDev lines] Added package nut-web-cgi based on demorfi@7e340f47944ff4a9c49d3b1dc6c1d9d965cd344c. Closes #1614. Pending signoff by @demorfi [martin.p.rowe@gmail.com: simplified implementation, no changes to Config.in] Added package nut-avahi-service similar to other implementations in #618 Bugfix to remove redundant NUT_DRIVER_SERIAL config Bugfix to make UPSLOG config actually install (requires PKG_RELEASE bump) Some code tidy-ups Signed-off-by: Martin Rowe <martin.p.rowe@gmail.com>
* nut: New package for Network UPS ToolsMarty R2014-10-15
An older version of nut is in oldpackages. This commit is based on that package and bumps the version to the latest release along with unifying the server and client packages. More build options are provided for any custom configuration but the defaults provide a working client and server install which only needs a UPS driver. Drivers still build as individual packages to minimise bloat. SSL support has also been added. Signed-off-by: Martin Rowe <cyanidium@users.noreply.github.com>
Powered by cgit, Themed by Ted Yin.