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

Install shared templates for client setup too #1931

Closed
wants to merge 2 commits into from

Conversation

abbra
Copy link
Contributor

@abbra abbra commented May 16, 2018

This patchset updates a spec file and our Make files to allow installing shared templates for the client build as well. So far we only have a single template for krb5.conf.d (freeipa.template) but there might be potentially more coming in.

This is a proper solution -- in Fedora 28/29 builds downstream I'm copying the files manually to avoid re-spinning a tarball with 4.7.0rc2. We still need to filter out client side templates from the server side in the spec file, so there is not a single place to define all files, unfortunately, but that's good enough for now as we have only a single file used by the client side.

@abbra abbra added the re-run Trigger a new run of PR-CI label May 16, 2018
@freeipa-pr-ci freeipa-pr-ci removed the re-run Trigger a new run of PR-CI label May 16, 2018
abbra added 2 commits May 16, 2018 12:36
freeipa.template should be packaged in freeipa-client-common
The rest of templates in /usr/share/ipa should go to freeipa-server-common

Fenerate file with server templates via find. Since we only need those
at /usr/share/ipa and not in subfolders, synthesize whole path based
on the name. This also gives us an easier way to get rid of the
%{buildroot} prefix.

Use -f option to %files to pass server templates file
FreeIPA has two major build modes and this affects how content
from install/share is handled:

 - server build: everything from install/share is installed
 - client build: only selected templates from install/share are
   installed

This change is needed to allow us reusing the same krb5.conf snippets
for both builds right now.
@abbra
Copy link
Contributor Author

abbra commented May 16, 2018

Pushed an update that should make tox targets work again.

@abbra abbra added the re-run Trigger a new run of PR-CI label May 16, 2018
@freeipa-pr-ci freeipa-pr-ci removed the re-run Trigger a new run of PR-CI label May 16, 2018
Copy link
Contributor

@frozencemetery frozencemetery left a comment

Choose a reason for hiding this comment

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

This looks good. I thought the original changes might be too simple and I guess that was right... thanks for fixing it.

@rcritten
Copy link
Contributor

rcritten commented Jun 5, 2018

Chose #1953 in favor of this one, closing.

@rcritten rcritten closed this Jun 5, 2018
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.

4 participants