[3006.x] Fix install of logrotate config for debian pkg #65318
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
salt-project-bot-prod-environment
bot
changed the title
barneysowood
force-pushed
the
65231-logrotate-pkg-config
branch
from
38117d6
to
49c7a57
Compare
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
s0undt3ch
approved these changes
Nov 3, 2023
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.
What does this PR do?
Fixes the install of logrotate config for the debian pkg by moving file to pkg/common/logrotate/salt-common. File is installed via salt-common.install file, which can't rename files, only copy them to a directory, so we need to rename the file and put it in a subdir of pkg/common.
If the incorrect /etc/logrotate.d/salt directory created by original 3006.3 packages is present, it is removed as part of preinst.
Adds /etc/logrotate.d/salt-common to salt.common.conffiles to ensure that dpkg will not overwrite configs modified by users.
Also updates RPM spec file for new location of logrotate config.
Config needs to be /etc/logrotate.d/salt-common as that is what is used by 3005.x packages - if we don't use the same name, we'll end up with duplicate/conflicting configs.
What issues does this PR fix or reference?
Fixes: #65231
Previous Behavior
Logrotate config was incorrectly copied to /etc/logrotated.d/salt/salt-common.logrotate
New Behavior
Config is copied to /etc/logrotate.d/salt-common and marked as a config file so dpkg will not overwrite modified configs.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.