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

Add ownership of the git configuration file #11180

Draft
wants to merge 1 commit into
base: rpm/develop
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

Name: rubygem-%{gem_name}
Version: 9.5.1
Release: 1%{?foremandist}%{?dist}
Release: 2%{?foremandist}%{?dist}
Summary: Template-syncing engine for Foreman
License: GPLv3
URL: https://github.com/theforeman/foreman_templates
Expand Down Expand Up @@ -67,6 +67,10 @@ cp -a .%{gem_dir}/* \
%foreman_bundlerd_file
%foreman_precompile_plugin -s

# Ensure a git config file exists
mkdir -p %{buildroot}%{foreman_dir}/.config/git
touch %{buildroot}%{foreman_dir}/.config/git/config

%files
%dir %{gem_instdir}
%license %{gem_instdir}/LICENSE
Expand All @@ -84,6 +88,9 @@ cp -a .%{gem_dir}/* \
%{foreman_assets_foreman}
%{foreman_webpack_plugin}
%{foreman_webpack_foreman}
%attr(-, foreman, foreman) %dir %{foreman_dir}/.config
%attr(-, foreman, foreman) %dir %{foreman_dir}/.config/git
%attr(0600, foreman, foreman) %config(noreplace) %{foreman_dir}/.config/git/config
Copy link
Member

Choose a reason for hiding this comment

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

Would this leave us with %{foreman_dir}/.config/ and %{foreman_dir}/.config/git/ being not owned by this package or any other package? I think so what makes me think we need then to add two %dir directives for them.

Choose a reason for hiding this comment

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

Would this leave us with %{foreman_dir}/.config/ and %{foreman_dir}/.config/git/ being not owned by this package or any other package?

Looks like it

# dnf whatprovides ~foreman/.config/git/config
Last metadata expiration check: 0:08:59 ago on Thu Aug 29 14:23:44 2024.
rubygem-foreman_templates-9.5.1-2.fm3_13.el9.noarch : Template-syncing engine for Foreman
Repo        : @System
Matched from:
Filename    : /usr/share/foreman/.config/git/config

# dnf whatprovides ~foreman/.config/git/
Last metadata expiration check: 0:08:56 ago on Thu Aug 29 14:23:44 2024.
Error: No matches found. If searching for a file, try specifying the full path or using a wildcard prefix ("*/") at the beginning.

# dnf whatprovides /usr/share/foreman/.config
Last metadata expiration check: 0:09:45 ago on Thu Aug 29 14:23:44 2024.
Error: No matches found. If searching for a file, try specifying the full path or using a wildcard prefix ("*/") at the beginning.

Copy link
Member Author

Choose a reason for hiding this comment

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

Would this leave us with %{foreman_dir}/.config/ and %{foreman_dir}/.config/git/ being not owned by this package or any other package? I think so what makes me think we need then to add two %dir directives for them.

I thought about that when writing it, but wasn't quite sure. It reminds that #9705 should be finished up as well.


%files doc
%doc %{gem_docdir}
Expand All @@ -94,6 +101,9 @@ cp -a .%{gem_dir}/* \
%{foreman_plugin_log}

%changelog
* Wed Aug 28 2024 Ewoud Kohl van Wijngaarden <[email protected]> - 9.5.1-2
- Add ownership of the git configuration file

* Sun Aug 11 2024 Foreman Packaging Automation <[email protected]> - 9.5.1-1
- Update to 9.5.1

Expand Down