Repository navigation
Conversation
|
A ZIP file with standard source tarball and another tarball with pre-built docs for commit de0f2e3 is temporarily available: NUT-tarballs-PR-3784.zip. |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
jimklimov
added
enhancement
service/daemon start/stop
jimklimov
added a commit
to jimklimov/nut
that referenced
this pull request
Oct 19, 2026
… - do not merge section data [networkupstools#2230, networkupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov
added a commit
to jimklimov/nut
that referenced
this pull request
Oct 19, 2026
…ls#3784] xcalloc() should fail on its own, but CodeQL insists... Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov
added a commit
to jimklimov/nut
that referenced
this pull request
Oct 19, 2026
…etworkupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov
added a commit
to jimklimov/nut
that referenced
this pull request
Oct 19, 2026
…tyle and use `NUT_PATH_MAX` [networkupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov
added a commit
to jimklimov/nut
that referenced
this pull request
Oct 19, 2026
…bles to `[NUT_PATH_MAX+1]` to accomodate final NUL [networkupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov
force-pushed
the
feat/config-subdirs
branch
from
October 19, 2026 15:55
3ba8b88 to
a19364e
Compare
jimklimov
added a commit
to jimklimov/nut
that referenced
this pull request
Oct 19, 2026
…tyle and use `NUT_PATH_MAX` [networkupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov
added a commit
to jimklimov/nut
that referenced
this pull request
Oct 19, 2026
…bles to `[NUT_PATH_MAX+1]` to accomodate final NUL [networkupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov
force-pushed
the
feat/config-subdirs
branch
from
October 19, 2026 16:31
a19364e to
7358d77
Compare
jimklimov
added
AI
jimklimov
added a commit
to jimklimov/nut
that referenced
this pull request
Oct 19, 2026
… - C++ and augeas lenses [networkupstools#2230, networkupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov
added
C++
nutconf
…networkupstools#2230, networkupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… - do not merge section data [networkupstools#2230, networkupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… - C++ and augeas lenses [networkupstools#2230, networkupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ls#3784] xcalloc() should fail on its own, but CodeQL insists... Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…etworkupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…tyle and use `NUT_PATH_MAX` [networkupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…bles to `[NUT_PATH_MAX+1]` to accomodate final NUL [networkupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
jimklimov
force-pushed
the
feat/config-subdirs
branch
from
October 20, 2026 00:35
15fbeb9 to
0635286
Compare
Member
Author
|
Offloaded brewed unrelated CI test fixes into #3786 to minimize the diff relevant to this PR. |
…kupstools#3784] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
|
❌ Build nut 2.8.5.5915-master failed (commit e4533cb631 by @jimklimov) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes: #2230
Add support for configuration sub-directory as well as file support for NUT configuration files:
ups.conf,upsd.conf,upsd.users,upsmon.conf,upssched.conf, CGIhosts.conf,upsset.conf, etc., exceptnutauth.confwhich already has directINCLUDEandINCLUDE_REQUIRESkeywords.Implemented support for additional configuration file discovery as
<confpath>/<conffile>.d/*.conf(also.../*.usersforupsd.users.d) processed in alphanumeric order byupsd, drivers andupsdrvctl(via common parseconf/upsconf code), vanilla clients, andnut-driver-enumeratorscript. This should allow to rename unneeded files out of the way (*.bak) or move them into a subdirectory. Outputs of e.g.nut-scannermay be directly redirected into a file (maybe a file per bus, as suggested in #2230), without careful stitching of global and device settings in an editor and copy-paste/append workflows. Likewise for integration into systems like HA, unraid, TrueNAS, etc. which can simplify their configuration generators.nutconf) and augeas lens code to automate config management.Any additional file restarts population of the root context, adding or replacing global configuration remembered there from earlier parsing, while sub-sections must be defined once (subsequent duplicate sections are ignored with a warning log).
Co-authored by IntelliJ Junie / Claude.