From 4d2ef43f287aa96df3d65b97977fc7a824b6b33c Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Thu, 29 May 2014 14:47:17 +0200 Subject: ipaplatform: Move all filesystem paths to ipaplatform.paths module https://fedorahosted.org/freeipa/ticket/4052 Reviewed-By: Petr Viktorin --- ipalib/constants.py | 3 ++- ipalib/errors.py | 3 ++- ipalib/plugins/migration.py | 5 +++-- ipalib/plugins/user.py | 5 +++-- ipalib/rpc.py | 3 ++- ipalib/session.py | 5 +++-- ipalib/x509.py | 3 ++- 7 files changed, 17 insertions(+), 10 deletions(-) (limited to 'ipalib') diff --git a/ipalib/constants.py b/ipalib/constants.py index 2269189f4..8ae545526 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -22,6 +22,7 @@ All constants centralised in one file. """ import socket +from ipaplatform.paths import paths from ipapython.dn import DN from ipapython.version import VERSION, API_VERSION @@ -34,7 +35,7 @@ except: FQDN = None # Path to CA certificate bundle -CACERT = '/etc/ipa/ca.crt' +CACERT = paths.IPA_CA_CRT # regular expression NameSpace member names must match: NAME_REGEX = r'^[a-z][_a-z0-9]*[a-z0-9]$|^[a-z]$' diff --git a/ipalib/errors.py b/ipalib/errors.py index 95b8b3b26..d69e33062 100644 --- a/ipalib/errors.py +++ b/ipalib/errors.py @@ -105,6 +105,7 @@ current block assignments: from ipalib.text import ngettext as ungettext import messages +from ipaplatform.paths import paths class PrivateError(StandardError): @@ -142,7 +143,7 @@ class SubprocessError(PrivateError): The exit code of the sub-process is available via the ``returncode`` instance attribute. For example: - >>> e = SubprocessError(returncode=1, argv=('/bin/false',)) + >>> e = SubprocessError(returncode=1, argv=(paths.BIN_FALSE,)) >>> e.returncode 1 >>> e.argv # argv is also available diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py index 8c44ccc27..6b630a464 100644 --- a/ipalib/plugins/migration.py +++ b/ipalib/plugins/migration.py @@ -33,6 +33,7 @@ from ipalib import _ from ipapython.dn import DN from ipapython.ipautil import write_tmp_file import datetime +from ipaplatform.paths import paths __doc__ = _(""" Migration to IPA @@ -185,13 +186,13 @@ def _pre_migrate_user(ldap, pkey, dn, entry_attrs, failed, config, ctx, **kwargs # fill in required attributes by IPA entry_attrs['ipauniqueid'] = 'autogenerate' if 'homedirectory' not in entry_attrs: - homes_root = config.get('ipahomesrootdir', ('/home', ))[0] + homes_root = config.get('ipahomesrootdir', (paths.HOME_DIR, ))[0] home_dir = '%s/%s' % (homes_root, pkey) home_dir = home_dir.replace('//', '/').rstrip('/') entry_attrs['homedirectory'] = home_dir if 'loginshell' not in entry_attrs: - default_shell = config.get('ipadefaultloginshell', ['/bin/sh'])[0] + default_shell = config.get('ipadefaultloginshell', [paths.SH])[0] entry_attrs.setdefault('loginshell', default_shell) # do not migrate all attributes diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index 2f700b60f..2ffc1ef4b 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -31,6 +31,7 @@ from ipalib.plugins import baseldap from ipalib.request import context from ipalib import _, ngettext from ipalib import output +from ipaplatform.paths import paths from ipapython.ipautil import ipa_generate_password from ipapython.ipavalidate import Email from ipalib.capabilities import client_has_capability @@ -729,14 +730,14 @@ class user_add(LDAPCreate): len = int(config.get('ipamaxusernamelength')[0]) ) ) - default_shell = config.get('ipadefaultloginshell', ['/bin/sh'])[0] + default_shell = config.get('ipadefaultloginshell', [paths.SH])[0] entry_attrs.setdefault('loginshell', default_shell) # hack so we can request separate first and last name in CLI full_name = '%s %s' % (entry_attrs['givenname'], entry_attrs['sn']) entry_attrs.setdefault('cn', full_name) if 'homedirectory' not in entry_attrs: # get home's root directory from config - homes_root = config.get('ipahomesrootdir', ['/home'])[0] + homes_root = config.get('ipahomesrootdir', [paths.HOME_DIR])[0] # build user's home directory based on his uid entry_attrs['homedirectory'] = posixpath.join(homes_root, keys[-1]) entry_attrs.setdefault('krbprincipalname', '%s@%s' % (entry_attrs['uid'], api.env.realm)) diff --git a/ipalib/rpc.py b/ipalib/rpc.py index f48a49481..9df22219e 100644 --- a/ipalib/rpc.py +++ b/ipalib/rpc.py @@ -59,6 +59,7 @@ from ipalib.util import get_current_principal from ipapython.ipa_log_manager import root_logger from ipapython import ipautil from ipapython import kernel_keyring +from ipaplatform.paths import paths from ipapython.cookie import Cookie from ipapython.dnsutil import DNSName from ipalib.text import _ @@ -482,7 +483,7 @@ class SSLTransport(LanguageAwareTransport): if self._connection and host == self._connection[0]: return self._connection[1] - dbdir = '/etc/pki/nssdb' + dbdir = paths.NSS_DB_DIR no_init = self.__nss_initialized(dbdir) if sys.version_info < (2, 7): conn = NSSHTTPS(host, 443, dbdir=dbdir, no_init=no_init) diff --git a/ipalib/session.py b/ipalib/session.py index 68b9b264b..ae40fdfe1 100644 --- a/ipalib/session.py +++ b/ipalib/session.py @@ -27,6 +27,7 @@ from text import _ from ipapython.ipa_log_manager import * from ipalib import api, errors from ipalib import Command +from ipaplatform.paths import paths from ipalib.krb_utils import * from ipapython.cookie import Cookie @@ -795,7 +796,7 @@ class MemcacheSessionManager(SessionManager): session data (see `load_session_data()`) ''' - memcached_socket_path = '/var/run/ipa_memcached/ipa_memcached' + memcached_socket_path = paths.VAR_RUN_IPA_MEMCACHED session_cookie_name = 'ipa_session' mc_server_stat_name_re = re.compile(r'(.+)\s+\((\d+)\)') @@ -1208,7 +1209,7 @@ class MemcacheSessionManager(SessionManager): #------------------------------------------------------------------------------- -krbccache_dir ='/var/run/ipa_memcached' +krbccache_dir =paths.IPA_MEMCACHED_DIR krbccache_prefix = 'krbcc_' def _get_krbccache_pathname(): diff --git a/ipalib/x509.py b/ipalib/x509.py index ca6eac50f..790f425cb 100644 --- a/ipalib/x509.py +++ b/ipalib/x509.py @@ -42,6 +42,7 @@ from ipalib import api from ipalib import _ from ipalib import util from ipalib import errors +from ipaplatform.paths import paths from ipapython.dn import DN PEM = 0 @@ -99,7 +100,7 @@ def load_certificate(data, datatype=PEM, dbdir=None): if api.env.in_tree: dbdir = api.env.dot_ipa + os.sep + 'alias' else: - dbdir = "/etc/httpd/alias" + dbdir = paths.HTTPD_ALIAS_DIR nss.nss_init(dbdir) else: nss.nss_init_nodb() -- cgit