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

Restore pki_instance_configuration_path param #4751

Merged
merged 1 commit into from
May 22, 2024
Merged

Restore pki_instance_configuration_path param #4751

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion base/server/python/pki/server/pkispawn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,20 @@ def main(argv):
deployer.instance.group = deployer.mdict['pki_group']

if args.conf_dir:
deployer.instance.actual_conf_dir = args.conf_dir
# Use --conf <dir> if specified.
conf_dir = args.conf_dir

else:
# Otherwise, use pki_instance_configuration_path param (default: None).
# This param is used by IPA to support containers. See:
# https://github.com/freeipa/freeipa/blob/master/install/share/ipaca_default.ini
conf_dir = deployer.mdict.get('pki_instance_configuration_path')

if conf_dir:
# If conf_dir is specified, the config files will be stored in the
# specified folder, and the <instance>/conf will link to that folder.
# Otherwise, config files will be stored in <instance>/conf directly.
deployer.instance.actual_conf_dir = conf_dir

if args.logs_dir:
deployer.instance.actual_logs_dir = args.logs_dir
Expand Down
Loading