diff options
author | Christian Heimes <cheimes@redhat.com> | 2016-11-28 16:24:33 +0100 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2016-12-02 09:14:35 +0100 |
commit | 1e6a204b4372bbbfb722a00370a5ce4e34406b9f (patch) | |
tree | b8deef8cc3b4f04990f5d305eafdeff14d5d8928 /install/oddjob | |
parent | 98f0077360884da6df31b351caaed7510dec94de (diff) | |
download | freeipa-1e6a204b4372bbbfb722a00370a5ce4e34406b9f.tar.gz freeipa-1e6a204b4372bbbfb722a00370a5ce4e34406b9f.tar.xz freeipa-1e6a204b4372bbbfb722a00370a5ce4e34406b9f.zip |
Set explicit confdir option for global contexts
Some API contexts are used to modify global state (e.g. files in /etc
and /var). These contexts do not support confdir overrides. Initialize
the API with an explicit confdir argument to paths.ETC_IPA.
The special contexts are:
* backup
* cli_installer
* installer
* ipctl
* renew
* restore
* server
* updates
The patch also corrects the context of the ipa-httpd-kdcproxy script to
'server'.
https://fedorahosted.org/freeipa/ticket/6389
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'install/oddjob')
-rwxr-xr-x | install/oddjob/com.redhat.idm.trust-fetch-domains | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/install/oddjob/com.redhat.idm.trust-fetch-domains b/install/oddjob/com.redhat.idm.trust-fetch-domains index a0d8a3165..e5c2e8ce5 100755 --- a/install/oddjob/com.redhat.idm.trust-fetch-domains +++ b/install/oddjob/com.redhat.idm.trust-fetch-domains @@ -8,6 +8,7 @@ from ipapython.dn import DN from ipalib.config import Env from ipalib.constants import DEFAULT_CONFIG from ipaplatform.constants import constants +from ipaplatform.paths import paths import sys import os import pwd @@ -95,7 +96,8 @@ env._bootstrap(debug=options.debug, log=None) env._finalize_core(**dict(DEFAULT_CONFIG)) # Initialize the API with the proper debug level -api.bootstrap(in_server=True, debug=env.debug, log=None, context='server') +api.bootstrap(in_server=True, debug=env.debug, log=None, + context='server', confdir=paths.ETC_IPA) api.finalize() # Only import trust plugin after api is initialized or internal imports |