Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RHEL 7 packaging: fix logrotate file conflict with rsyslog #3324

Merged
merged 2 commits into from Jun 24, 2020

Conversation

MrAnno
Copy link
Collaborator

@MrAnno MrAnno commented Jun 16, 2020

Fixes #1384

I had long discussions with Red Hat about it, but renaming it to syslog-ng does not work.
#1384 (comment)

More info: #1384 (comment)

@MrAnno
Copy link
Collaborator Author

MrAnno commented Jun 16, 2020

@kira-syslogng build packages please

@MrAnno
Copy link
Collaborator Author

MrAnno commented Jun 16, 2020

@czanik Please tell us when you backport this to the "official" syslog-ng package in EPEL 8.
Thanks for the patch. 👍

@MrAnno MrAnno force-pushed the fix-rpm-rsyslog-conflict branch 2 times, most recently from c93d358 to 5753cf0 Compare June 16, 2020 14:46
@MrAnno MrAnno requested review from czanik and removed request for czanik June 16, 2020 14:46
@kira-syslogng
Copy link
Contributor

Package Build SUCCESS

Packages are available at https://ci.syslog-ng.com/jenkins/job/kira-dbld-pull-requests/691/artifact/

@kira-syslogng
Copy link
Contributor

Build SUCCESS

@MrAnno MrAnno changed the title packaging/rhel: fix rsyslog logrotate conflict on RHEL 7 RHEL 7 packaging: fix logrotate file conflict with rsyslog Jun 16, 2020
czanik
czanik previously approved these changes Jun 17, 2020
Copy link
Contributor

@czanik czanik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. 👍
I plan to work on the official EPEL 8 package next week, as I already spent a lot more time on RPM packaging this week than I planned...

@bazsi
Copy link
Collaborator

bazsi commented Jun 17, 2020 via email

@czanik
Copy link
Contributor

czanik commented Jun 17, 2020

No, there is nothing we can do here. In RHEL 8 the rsyslog package has its logrotate file as /etc/logrotate.d/syslog, but has rsyslog specific part in it (reloading rsyslog). If we copy an rsyslog-related logrotate file to /etc/logrotae.d/syslog-ng then the config in the syslog-ng-logrotate subpackage would not overwrite it and would not work.

@bazsi
Copy link
Collaborator

bazsi commented Jun 17, 2020 via email

@czanik
Copy link
Contributor

czanik commented Jun 17, 2020

No. I ran into too many sed magic fixing corner cases in syslog-ng packaging and causing hard to debug problems later on.

@MrAnno
Copy link
Collaborator Author

MrAnno commented Jun 23, 2020

@czanik
Copy link
Contributor

czanik commented Jun 23, 2020

syslog-ng.spec.diff.txt
I did not receive any further feedback, but as it resolves both the original problem (rsyslog & syslog-ng together) and Evan's problem (name change) I think it's good enough. Tested on Fedora 31, CentOS 7 and CentOS 8, and worked everywhere as expected.
As usual, I lack necessary git skills, so ere is a new diff for syslog-ng.spec. I removed my other changes (related to removing java modules). The changelog part is also a bit messed up...

czanik and others added 2 commits June 24, 2020 11:08
Signed-off-by: Peter Czanik <peter@czanik.hu>
Signed-off-by: László Várady <laszlo.varady@protonmail.com>
@MrAnno
Copy link
Collaborator Author

MrAnno commented Jun 24, 2020

Thanks. PR updated.

@MrAnno
Copy link
Collaborator Author

MrAnno commented Jun 24, 2020

@kira-syslogng build packages, please

@kira-syslogng
Copy link
Contributor

Package Build SUCCESS

Packages are available at https://ci.syslog-ng.com/jenkins/job/kira-dbld-pull-requests/693/artifact/

Copy link
Contributor

@czanik czanik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! 👍

@kira-syslogng
Copy link
Contributor

Build SUCCESS

@szemere szemere merged commit a66a82d into syslog-ng:master Jun 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Yum Install dependency collision with rsyslog
5 participants