Commit c1aa1f784c which backported
a number of fixes from master, missed one fix for nut-cgi. If
nut-cgi is installed standalone or nut-cgi starts before nut-server
(the default in 18.04.5) then the configuration file directory does
not get create and therefore there is no CGI configuration file.
This commit fixes that.
Closes: #10687
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
Make sure we force shutdown of UPS only when we should, and when
we should that shutdown happens.
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
The server and driver were not starting/restarting reliably. In
addition on interface changes NUT got very confused. So we fix
handling of restarts and add a reload trigger for interface
changes.
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
Extra parameters for the UPS driver were not being handled correctly.
Fix that (was wrong variable name).
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
The statepath was getting the wrong permission and/or not created
at the right time. This commit includes fixes for handling the
statepath (typically /var/run/nut).
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
Running as non-root was failing due to misplace local keyword
causing runas to be unset from calling value.
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
1) For upsmon start and stop were at wrong position in rc.d
2) Stop needs more than just killing the procd instead but rather
needs a stop command to be issued.
3) Interface up/down was causing not to enter a crashloop (we fix this
with procd trigger on interface changes).
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
Running as non-root was failing due to misplace local keyword
causing runas to be unset from calling value.
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
CONFIG_ARGS has --without-wrap so libwrap as a dependency is
extraneous as it is not actually used.
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
Since the new hotplug script in master was not backport (new feature),
for 18.06 branch revert the old behavior of running NUT daemons and
drivers as root by default to avoid permisions problems, but backport
fix the support for running as another user for those who can set the
appropriate permissions on the USB (or other) device.
Closes: #7742
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
Backport and squash the following commits from master:
5790053eb nut: Add missing conffiles
ceff68837 nut: Reorganize nut-server to clarify nut-driver
f6a2a97d2 nut: Use 'real' procd init for nut-monitor
918a62f91 nut: Make FSD really work
a2f64b3ba nut: Reduce user error with POWERDOWNFLAG
461393810 nut: Use quotes around filenames
1b6dbe7a7 nut: Remove duplicate/extraneous lines
0a49d0ffb nut: Fix checking for path before it exists
3b5a8eee8 nut: Various startup fixes for monitor and server
44e57d4bd nut: Fix variables for NUT drivers
36fd59dc7 nut: Fix extraneous config_get
192b0f164 nut: Fix a typo in setting a driver parameter
f48b060fa nut: Fix upsd runs as root
And bump PKG_RELEASE
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
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>
(cherry picked from commit 98fdf16ecb)
We need to force this since a *.m4 file is patched.
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry picked from commit 6543859dab)
fix Makefile chmod (644)
replace MD5SUM with HASH
add PKG_MIRROR_HASH when PKG_SOURCE_PROTO:=git
(PKG_SOURCE_PROTO:=svn tarballs are not reproducible for now)
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
Per user request ship the sample upsset.conf file so that
upsset functionality can be used with nut-cgi
Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
Current maintainer (Martin Rowe) offered to hand over
maintership because I'm interested in doing more with
the package than he requires for his own use, so he
felt it made sense for me to maintain the package.
I accepted, hence this commit.
Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
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>
It looks like serial support was accidentally dropped due to missing
pieces on Config.in and Makefile. Add back serial support by fixing
that.
Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
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>
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>
Updated the package to the latest upstream version.
Removed a patch that was merged upstream.
Bumped copyright notice to 2015.
Signed-off-by: Martin Rowe <martin.p.rowe@gmail.com>
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>
Daniel F. Dickinson