Skip to content

packaging: set all *.conf.examples as %config(noreplace)#2268

Merged
BareosBot merged 3 commits intobareos:masterfrom
bruno-at-bareos:dev/bruno/master/fix-rpm-examples-files-as-config
May 15, 2025
Merged

packaging: set all *.conf.examples as %config(noreplace)#2268
BareosBot merged 3 commits intobareos:masterfrom
bruno-at-bareos:dev/bruno/master/fix-rpm-examples-files-as-config

Conversation

@bruno-at-bareos
Copy link
Contributor

@bruno-at-bareos bruno-at-bareos commented May 12, 2025 •
edited
Loading

With #2090 *.conf.example files get modified when installing a package.

on RPM based distributions rpm -V should not lead to a altered package warning.
*.example.conf files are now marked as config files in the spec file.

Signed-off-by: Bruno Friedmann bruno.friedmann@bareos.com

Thank you for contributing to the Bareos Project!

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

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-tool to have some simple automated checks run and a proper changelog record added.

General
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
  • Required backport PRs have been created
  • Correct milestone is set
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR

@bruno-at-bareos bruno-at-bareos self-assigned this May 12, 2025
@bruno-at-bareos bruno-at-bareos requested a review from arogge May 12, 2025 14:38
@bruno-at-bareos
Copy link
Contributor Author

bruno-at-bareos commented May 12, 2025

Results on a EL9 system after installation

rpm -vV bareos-director
.........    /etc/bareos/bareos-dir-export
.........    /etc/bareos/bareos-dir-export/client
.........  c /etc/bareos/bareos-dir.d/catalog/MyCatalog.conf
S.5....T.  c /etc/bareos/bareos-dir.d/client/bareos-fd.conf
S.5....T.  c /etc/bareos/bareos-dir.d/console/bareos-mon.conf
S.5....T.  c /etc/bareos/bareos-dir.d/director/bareos-dir.conf
.........  c /etc/bareos/bareos-dir.d/fileset/Catalog.conf
.........  c /etc/bareos/bareos-dir.d/fileset/LinuxAll.conf
.........  c /etc/bareos/bareos-dir.d/fileset/SelfTest.conf
.........  c /etc/bareos/bareos-dir.d/fileset/Windows All Drives.conf
.........  c /etc/bareos/bareos-dir.d/job/BackupCatalog.conf
.........  c /etc/bareos/bareos-dir.d/job/RestoreFiles.conf
.........  c /etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
.........  c /etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf
.........  c /etc/bareos/bareos-dir.d/messages/Daemon.conf
.........  c /etc/bareos/bareos-dir.d/messages/Standard.conf
.........  c /etc/bareos/bareos-dir.d/pool/Differential.conf
.........  c /etc/bareos/bareos-dir.d/pool/Full.conf
.........  c /etc/bareos/bareos-dir.d/pool/Incremental.conf
.........  c /etc/bareos/bareos-dir.d/pool/Scratch.conf
.........  c /etc/bareos/bareos-dir.d/profile/operator.conf
.........  c /etc/bareos/bareos-dir.d/schedule/WeeklyCycle.conf
.........  c /etc/bareos/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf
S.5....T.  c /etc/bareos/bareos-dir.d/storage/File.conf
S.5....T.  c /etc/bareos/bareos-dir.d/storage/File.conf.example
.........    /etc/bareos/tray-monitor.d/director
.........  c /etc/bareos/tray-monitor.d/director/Director-local.conf
.........  c /etc/logrotate.d/bareos-dir
.........  a /usr/lib/.build-id
.........  a /usr/lib/.build-id/ad
.........  a /usr/lib/.build-id/ad/57497842d49e9dce2d5c61c988bfd2ff6f0ea7
.........    /usr/lib/bareos/scripts/delete_catalog_backup
.........    /usr/lib/bareos/scripts/make_catalog_backup
.........  c /usr/lib/bareos/scripts/query.sql
.........    /usr/lib/systemd/system/bareos-dir.service
.........    /usr/sbin/bareos-dir
.........    /usr/share/doc/bareos
.........  d /usr/share/man/man8/bareos-dir.8.gz
.........  d /usr/share/man/man8/bareos.8.gz

arogge
arogge approved these changes May 13, 2025
View reviewed changes
Copy link
Member

@arogge arogge left a comment

Choose a reason for hiding this comment

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

Looks correct. Go ahead!

@bruno-at-bareos bruno-at-bareos mentioned this pull request May 13, 2025
Merged
7 tasks
@bruno-at-bareos bruno-at-bareos added this to the 25.0.0 milestone May 13, 2025
bruno-at-bareos and others added 2 commits May 15, 2025 10:30
@bruno-at-bareos @sebsura
packaging: set all *.conf.examples as %config(noreplace)
eebfd25 
With bareos#2090 *.conf.example files get modified when
installing a package.

on RPM based distributions `rpm -V` should not lead to a altered
package warning.

`*.example.conf` files are marked as config files in the spec file.

Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
@sebsura
tests: fix oom on ci
6f33de0
@sebsura sebsura force-pushed the dev/bruno/master/fix-rpm-examples-files-as-config branch from 8f784bb to 6f33de0 Compare May 15, 2025 08:32
@BareosBot BareosBot merged commit 81b182d into bareos:master May 15, 2025
1 check was pending
@bruno-at-bareos bruno-at-bareos deleted the dev/bruno/master/fix-rpm-examples-files-as-config branch November 26, 2025 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@arogge arogge arogge approved these changes

Assignees

@bruno-at-bareos bruno-at-bareos

Labels

bug This addresses a bug requires backport to 24

Projects

None yet

Milestone

25.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@bruno-at-bareos @arogge @BareosBot @sebsura