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.

Sign up for GitHub

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

Jump to bottom

Fixes #29737 - Put smart proxy plugin local state into /var/lib/foreman-proxy #5197

Merged
merged 4 commits into from May 15, 2020
Merged

Fixes #29737 - Put smart proxy plugin local state into /var/lib/foreman-proxy #5197

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1f8903
Fixes #29737 - Put smart proxy plugin local state into /var/lib/forem…
adamruzicka May 12, 2020
a7162c6
Fixes #29737 - s/localstatedir/sharedstatedir/g
adamruzicka May 12, 2020
a156810
Fixes #29737 - Update gem2rpm template
adamruzicka May 12, 2020
4cbbfd8
Fixes #29737 - s/localstatedir/sharedstatedir/g for all plugins
adamruzicka May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions packages/plugins/rubygem-smart_proxy_ansible/rubygem-smart_proxy_ansible.spec
View file
Open in desktop
Expand Up @@ -11,14 +11,14 @@

%global foreman_proxy_min_version 1.25
%global foreman_proxy_dir %{_root_datadir}/foreman-proxy
%global foreman_proxy_statedir %{_root_localstatedir}/foreman-proxy
%global foreman_proxy_statedir %{_root_localstatedir}/lib/foreman-proxy
Copy link
Member

Choose a reason for hiding this comment

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

Looks like f825335 introduced this so will need a cherry pick to 2.0. Prior to it, it was %{_localstatedir}/lib/foreman-proxy. I think what was meant, was %{_sharedstatedir} (see https://docs.fedoraproject.org/en-US/packaging-guidelines/RPMMacros/).

Suggested change
%global foreman_proxy_statedir %{_root_localstatedir}/lib/foreman-proxy
%global foreman_proxy_statedir %{_root_sharedstatedir}/foreman-proxy

Note that the definition of _root_localstatedir should also be changed a few lines above then.

%global foreman_proxy_bundlerd_dir %{foreman_proxy_dir}/bundler.d
%global foreman_proxy_settingsd_dir %{_root_sysconfdir}/foreman-proxy/settings.d
%global smart_proxy_dynflow_bundlerd_dir %{!?scl:/opt/theforeman/tfm/root}%{_datadir}/smart_proxy_dynflow_core/bundler.d

Name: %{?scl_prefix}rubygem-%{gem_name}
Version: 3.0.1
Release: 3%{?foremandist}%{?dist}
Release: 4%{?foremandist}%{?dist}
Summary: Smart-Proxy Ansible plugin
Group: Applications/Internet
License: GPLv3
Expand Down Expand Up @@ -159,6 +159,9 @@ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
%doc %{gem_instdir}/README.md

%changelog
* Tue May 12 2020 Adam Ruzicka <aruzicka@redhat.com> 3.0.1-4
- Move local state to /var/lib

* Tue Jan 07 2020 Eric D. Helms <ericdhelms@gmail.com> - 3.0.1-3
- Build for SCL

Expand Down
7 changes: 5 additions & 2 deletions packages/plugins/rubygem-smart_proxy_dynflow/rubygem-smart_proxy_dynflow.spec
View file
Open in desktop
Expand Up @@ -11,15 +11,15 @@

%global foreman_proxy_min_version 1.25
%global foreman_proxy_dir %{_root_datadir}/foreman-proxy
%global foreman_proxy_statedir %{_root_localstatedir}/foreman-proxy
%global foreman_proxy_statedir %{_root_localstatedir}/lib/foreman-proxy
%global foreman_proxy_bundlerd_dir %{foreman_proxy_dir}/bundler.d
%global foreman_proxy_settingsd_dir %{_root_sysconfdir}/foreman-proxy/settings.d
%global smart_proxy_dynflow_bundlerd_dir %{!?scl:/opt/theforeman/tfm/root}%{_datadir}/smart_proxy_dynflow_core/bundler.d

Summary: Dynflow runtime for Foreman smart proxy
Name: %{?scl_prefix}rubygem-%{gem_name}
Version: 0.2.4
Release: 3%{?foremandist}%{?dist}
Release: 4%{?foremandist}%{?dist}
Group: Applications/System
License: GPLv3
URL: https://github.com/theforeman/smart_proxy_dynflow
Expand Down Expand Up @@ -120,6 +120,9 @@ mkdir -p %{buildroot}%{foreman_proxy_statedir}/dynflow
%{gem_instdir}/Gemfile

%changelog
* Tue May 12 2020 Adam Ruzicka <aruzicka@redhat.com> 0.2.4-4
- Move local state to /var/lib

* Tue Jan 07 2020 Eric D. Helms <ericdhelms@gmail.com> - 0.2.4-3
- Build for SCL

Expand Down
7 changes: 5 additions & 2 deletions ...ns/rubygem-smart_proxy_remote_execution_ssh/rubygem-smart_proxy_remote_execution_ssh.spec
View file
Open in desktop
Expand Up @@ -11,14 +11,14 @@

%global foreman_proxy_min_version 1.25
%global foreman_proxy_dir %{_root_datadir}/foreman-proxy
%global foreman_proxy_statedir %{_root_localstatedir}/foreman-proxy
%global foreman_proxy_statedir %{_root_localstatedir}/lib/foreman-proxy
%global foreman_proxy_bundlerd_dir %{foreman_proxy_dir}/bundler.d
%global foreman_proxy_settingsd_dir %{_root_sysconfdir}/foreman-proxy/settings.d
%global smart_proxy_dynflow_bundlerd_dir %{!?scl:/opt/theforeman/tfm/root}%{_datadir}/smart_proxy_dynflow_core/bundler.d

Name: %{?scl_prefix}rubygem-%{gem_name}
Version: 0.3.0
Release: 1%{?foremandist}%{?dist}
Release: 2%{?foremandist}%{?dist}
Summary: Ssh remote execution provider for Foreman Smart-Proxy
Group: Applications/Internet
License: GPLv3
Expand Down Expand Up @@ -135,6 +135,9 @@ EOF
%doc %{gem_instdir}/README.md

%changelog
* Tue May 12 2020 Adam Ruzicka <aruzicka@redhat.com> 0.3.0-2
- Move local state to /var/lib

* Wed May 06 2020 Adam Ruzicka <aruzicka@redhat.com> 0.3.0-1
- Update to 0.3.0

Expand Down