reorganize zm config files #1937
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
|
I tested this and the files put in conf.d had @ZM_BLAH@ replacements instead of the values. Have we missed a step? |
|
Oh right, I need to make this a .in file and tell cmake to process it. |
|
should work now |
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.
The goal of this pr is to avoid the condition where the target system package manager defaults to not overwrite config files.
This is done by putting zm.conf back to the state it was in prior to 1.31.0 and creating a new config file under conf.d called 01-system-paths.conf containing the variable newly migrated out of the dB.
This pr also includes rpm specfile changes to accommodate the new files. Changes to the debian packaging scripts were not required.