config: update directives and error out on bconsole config warnings#2217
Merged
BareosBot merged 23 commits intobareos:masterfrom Apr 16, 2025
Merged
Conversation
25c70c9 to
1cddf90
Compare
sebsura
requested changes
Mar 21, 2025
Contributor
sebsura
left a comment
There was a problem hiding this comment.
While i like the idea of unifying all ports/.../etc. directives, this will cause way to much friction during the update.
The only way i can imagine us doing something like this,
- is adding e.g.
Portas an alias (that doesnt cause warnings) and then after ~3-5 years we deprecatedDirPort, so that users have a lot of time to change, or - or adding a script/program that upgrades the users configuration automatically.
2.) would be pretty nice, but i dont think we currently have the resources for this.
Contributor
Author
|
I agree with the concerns for the warnings, but I thought this was what we decided to opt for. |
Member
|
As just discussed in person:
|
sebsura
requested changes
Mar 28, 2025
...manuals/source/manually_added_config_directive_descriptions/console-director-DirPort.rst.inc
Show resolved
Hide resolved
systemtests/tests/tls-suites/etc/bareos/bconsole-TLS_CHACHA20_POLY1305_SHA256.conf.in
Outdated
Show resolved
Hide resolved
systemtests/tests/config-dump/etc/orig/bareos-dir-19.2.7-show-verbose.conf
Outdated
Show resolved
Hide resolved
fa93f47 to
57f14af
Compare
sebsura
requested changes
Apr 11, 2025
Contributor
sebsura
left a comment
There was a problem hiding this comment.
Nice changes. Dont forget to reformat the shell script files with the options we discussed internally.
systemtests/tests/webui-common/etc/bareos-webui/directors.ini.in
Outdated
Show resolved
Hide resolved
a26b027 to
90bac4f
Compare
in the same way the director, file and storage daemons do.
replace DirPort with Port (Director -> Console).
rename the following directives: (Director -> Director) - DirPort to Port - DirAddress to Address - DirAddresses to Addresses - DirSourceAddress to SourceAddress (Client -> File Daemon) - FdPort to Port - FdAddress to Address - FdAddresses to Addresses - FdSourceAddress to SourceAddress (Storage -> Storage) - SdPort to Port - SdAddress to Address - SdAddresses to Addresses - SdSourceAddress to SourceAddress (Director -> Tray Monitor) - DirPort to Port (Client -> Tray Monitor) - FdPort to Port (Storage -> Tray Monitor) - SdPort to Port - SdAddress to Address - SdPassword to Password
replace DirAddresses with Addresses.
replace dir, fd, sd, prefixed aliases with original directives
as discussed on 2025-03-25
also changed their indentation to 2 spaces.
only in the files previously changed by me
using the flags "--indent 2 --binary-next-line --case-indent --func-next-line" as in issue bareos#321
d977fac to
86f8233
Compare
sebsura
approved these changes
Apr 16, 2025
Contributor
sebsura
left a comment
There was a problem hiding this comment.
Thanks for the great work! The scripts look much better now.
so that the build succeeds
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
4 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: #2210
This PR does multiple things:
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
Source code quality