config: fix issues with config directive aliases#2159
Merged
BareosBot merged 11 commits intobareos:masterfrom Feb 28, 2025
Merged
config: fix issues with config directive aliases#2159BareosBot merged 11 commits intobareos:masterfrom
BareosBot merged 11 commits intobareos:masterfrom
Conversation
Contributor
Author
|
I still need to fix the documentation for the aliases. |
d1ce668 to
5b72a4a
Compare
beff7e0 to
4fbe53f
Compare
4fbe53f to
0e4c42c
Compare
sebsura
requested changes
Feb 13, 2025
Contributor
sebsura
left a comment
There was a problem hiding this comment.
This looks very good. Nice work!
0e4c42c to
fe87417
Compare
10 tasks
Adjust aliases like agreed with the team: Director -> Client - FdAddress is an alias for Address - FdPort is an alias for Port - FdPassword is an alias for Password Director -> Storage - SdAddress is an alias for Address - SdPort is an alias for Port - SdPassword is an alias for Password Director -> Catalog - Address is an alias for DbAddress - Port is an alias for DbPort - User is an alias for DbUser - Password is an alias for DbPassword - Socket is an alias for DbSocket Console -> Director - DirAddress is an alias for Address - DirPort is an alias for Port
c977fe0 to
74f0835
Compare
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
3 participants
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.
Fixes internal issue#167
Currently, aliases are defined as new directives with the flag CFG_ITEM_ALIAS.
The problem with this approach is that nowhere is specified which directive this is an alias to.
This information is important, e.g. if the original directive is marked as CFG_ITEM_REQUIRED, because specifying one of its aliases should suffice the requirement.
Also, outputting the parsed config wasn't working with aliases, because they were simply skipped.
To solve this i added a new member ResourceItem::aliases (std::set<std::string>) to track the aliases of a directive.
This PR
Thank you for contributing to the Bareos Project!
Please check
If you have any questions or problems, please give a comment in the PR.
Helpful documentation and best practices
Checklist for the reviewer of the PR (will be processed by the Bareos team)
Make sure you check/merge the PR using
devtools/pr-toolto have some simple automated checks run and a proper changelog record added.General
Required backport PRs have been createdSource code quality