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/advise | |
| 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/advise')
| -rw-r--r-- | ipaserver/advise/plugins/legacy_clients.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ipaserver/advise/plugins/legacy_clients.py b/ipaserver/advise/plugins/legacy_clients.py index 9e381f12a..7439f584a 100644 --- a/ipaserver/advise/plugins/legacy_clients.py +++ b/ipaserver/advise/plugins/legacy_clients.py @@ -20,8 +20,9 @@ import os from ipalib import api from ipalib.plugable import Registry +from ipaplatform.paths import paths from ipaserver.advise.base import Advice -from ipapython.ipautil import template_file, SHARE_DIR +from ipapython.ipautil import template_file register = Registry() @@ -67,7 +68,7 @@ class config_base_legacy_client(Advice): def configure_and_start_sssd(self): uri, base = self.get_uri_and_base() template = os.path.join( - SHARE_DIR, + paths.USR_SHARE_IPA_DIR, 'advise', 'legacy', 'sssd.conf.template' @@ -132,7 +133,7 @@ class config_generic_linux_sssd_before_1_9(config_base_legacy_client): self.check_compat_plugin() with open(os.path.join( - SHARE_DIR, + paths.USR_SHARE_IPA_DIR, 'advise', 'legacy', 'pam.conf.sssd.template')) as fd: @@ -222,7 +223,7 @@ class config_generic_linux_nss_pam_ldapd(config_base_legacy_client): self.check_compat_plugin() with open(os.path.join( - SHARE_DIR, + paths.USR_SHARE_IPA_DIR, 'advise', 'legacy', 'pam.conf.nss_pam_ldapd.template')) as fd: @@ -289,7 +290,7 @@ class config_freebsd_nss_pam_ldapd(config_base_legacy_client): self.check_compat_plugin() with open(os.path.join( - SHARE_DIR, + paths.USR_SHARE_IPA_DIR, 'advise', 'legacy', 'pam_conf_sshd.template')) as fd: |