diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-11-22 16:06:45 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-29 14:50:51 +0100 |
| commit | d6b755e3fcaf32158f4ee36d45e3344b4a03fbc2 (patch) | |
| tree | e14721c8fee437c408319276568954cf81310600 /ipaserver/install/custodiainstance.py | |
| parent | f919ab4ee0ec26d77ee6978e75de5daba4073402 (diff) | |
| download | freeipa-d6b755e3fcaf32158f4ee36d45e3344b4a03fbc2.tar.gz freeipa-d6b755e3fcaf32158f4ee36d45e3344b4a03fbc2.tar.xz freeipa-d6b755e3fcaf32158f4ee36d45e3344b4a03fbc2.zip | |
ipautil: remove SHARE_DIR and PLUGIN_SHARE_DIR
SHARE_DIR and PLUGIN_SHARE_DIR depend on ipaplatform.
Replace all uses of SHARE_DIR with paths.USR_SHARE_IPA_DIR and remove
both SHARE_DIR and PLUGIN_SHARE_DIR.
https://fedorahosted.org/freeipa/ticket/6474
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipaserver/install/custodiainstance.py')
| -rw-r--r-- | ipaserver/install/custodiainstance.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/install/custodiainstance.py b/ipaserver/install/custodiainstance.py index 604a6da3e..a0bb399d5 100644 --- a/ipaserver/install/custodiainstance.py +++ b/ipaserver/install/custodiainstance.py @@ -40,7 +40,7 @@ class CustodiaInstance(SimpleServiceInstance): def __config_file(self): template_file = os.path.basename(self.config_file) + '.template' - template = os.path.join(ipautil.SHARE_DIR, template_file) + template = os.path.join(paths.USR_SHARE_IPA_DIR, template_file) httpd_info = pwd.getpwnam(constants.HTTPD_USER) sub_dict = dict(IPA_CUSTODIA_CONF_DIR=paths.IPA_CUSTODIA_CONF_DIR, IPA_CUSTODIA_SOCKET=paths.IPA_CUSTODIA_SOCKET, |