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 /ipaplatform | |
| 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 'ipaplatform')
| -rw-r--r-- | ipaplatform/base/paths.py | 1 | ||||
| -rw-r--r-- | ipaplatform/redhat/tasks.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index 41712e9cd..47f518577 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -234,7 +234,6 @@ class BasePathNamespace(object): HTML_KRBREALM_CON = "/usr/share/ipa/html/krbrealm.con" NIS_ULDIF = "/usr/share/ipa/nis.uldif" NIS_UPDATE_ULDIF = "/usr/share/ipa/nis-update.uldif" - IPA_PLUGINS = "/usr/share/ipa/plugins" SCHEMA_COMPAT_ULDIF = "/usr/share/ipa/schema_compat.uldif" IPA_JS_PLUGINS_DIR = "/usr/share/ipa/ui/js/plugins" UPDATES_DIR = "/usr/share/ipa/updates/" diff --git a/ipaplatform/redhat/tasks.py b/ipaplatform/redhat/tasks.py index 3766eb344..57e05e26f 100644 --- a/ipaplatform/redhat/tasks.py +++ b/ipaplatform/redhat/tasks.py @@ -446,7 +446,7 @@ class RedHatTaskNamespace(BaseTaskNamespace): os.mkdir(paths.SYSTEMD_SYSTEM_HTTPD_D_DIR, 0o755) ipautil.copy_template_file( - os.path.join(ipautil.SHARE_DIR, 'ipa-httpd.conf.template'), + os.path.join(paths.USR_SHARE_IPA_DIR, 'ipa-httpd.conf.template'), paths.SYSTEMD_SYSTEM_HTTPD_IPA_CONF, dict( KRB5CC_HTTPD=paths.KRB5CC_HTTPD, |