Preserve even more stunnel certs on upgrade #39
Merged
Conversation
This file contains 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
buildRestoreList: include xapi-stunnel-ca-bundle.pem 9a09a4d preserves the certs themselves, but for some reason the bundle is not necessarily regenerated from them, (especially when the dir was empty and is "thus" not preserved?) so preserve the bundle as well - as was done for the pool bundle. Signed-off-by: Yann Dirson <[email protected]> (cherry picked from commit 117bde708f89cf532abe3175e68690674ed3ddbe)
Signed-off-by: Yann Dirson <[email protected]>
…e go If the specified dir exists but is empty (as can happen for /etc/stunnel/certs), the current code would not restore it, as in fact it restores not the dir, but its immediate children matching the pattern. When no pattern is given, avoid complications by using the fact that restore_file perfectly works with directories too. Note this makes it prominent that the 're' handling is only ever applied to immediate children of the dir; we may simplify further by moving the pattern-matching code down to restore_file, but then do we want to keep the current behavior? Signed-off-by: Yann Dirson <[email protected]>
benjamreis
approved these changes
Aug 8, 2024
bleader
approved these changes
Aug 8, 2024
stormi
approved these changes
Aug 8, 2024
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.
This is the xcp-ng-8.3 version of xenserver#164 (submitted upstream as a complement to xenserver#158, the xenserver#164 backport not yet merged).
It is a complement to #35 (original xcp-ng-8.3 version of xenserver#158).