diff options
| author | Tomas Babej <tbabej@redhat.com> | 2014-05-29 14:47:17 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-06-16 19:48:20 +0200 |
| commit | 4d2ef43f287aa96df3d65b97977fc7a824b6b33c (patch) | |
| tree | 4adba8f39e1f874c89a73993d6a6455b649b7bb9 /install | |
| parent | c7edd7b68c98d105f02a5977a0ff7c2a3081f2c9 (diff) | |
ipaplatform: Move all filesystem paths to ipaplatform.paths module
https://fedorahosted.org/freeipa/ticket/4052
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'install')
| -rw-r--r-- | install/migration/migration.py | 3 | ||||
| -rw-r--r-- | install/wsgi/plugins.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/install/migration/migration.py b/install/migration/migration.py index acc1ee48d..b629b1c9f 100644 --- a/install/migration/migration.py +++ b/install/migration/migration.py @@ -30,6 +30,7 @@ from ipapython.ipautil import get_ipa_basedn from ipapython.dn import DN from ipapython.ipaldap import IPAdmin from ipalib import errors +from ipaplatform.paths import paths def wsgi_redirect(start_response, loc): @@ -89,7 +90,7 @@ def application(environ, start_response): if not form_data.has_key('username') or not form_data.has_key('password'): return wsgi_redirect(start_response, 'invalid.html') - slapd_sockets = glob.glob('/var/run/slapd-*.socket') + slapd_sockets = glob.glob(paths.ALL_SLAPD_INSTANCE_SOCKETS) if slapd_sockets: ldap_uri = 'ldapi://%s' % slapd_sockets[0].replace('/', '%2f') else: diff --git a/install/wsgi/plugins.py b/install/wsgi/plugins.py index 3c5354838..82b35eb43 100644 --- a/install/wsgi/plugins.py +++ b/install/wsgi/plugins.py @@ -22,9 +22,10 @@ Plugin index generation script """ import os +from ipaplatform.paths import paths from ipapython.ipa_log_manager import root_logger -PLUGINS_DIR = "/usr/share/ipa/ui/js/plugins" +PLUGINS_DIR = paths.IPA_JS_PLUGINS_DIR def get_plugin_index(): |