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 /ipaserver/install/plugins | |
| parent | c7edd7b68c98d105f02a5977a0ff7c2a3081f2c9 (diff) | |
| download | freeipa-4d2ef43f287aa96df3d65b97977fc7a824b6b33c.tar.gz freeipa-4d2ef43f287aa96df3d65b97977fc7a824b6b33c.tar.xz freeipa-4d2ef43f287aa96df3d65b97977fc7a824b6b33c.zip | |
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 'ipaserver/install/plugins')
| -rw-r--r-- | ipaserver/install/plugins/ca_renewal_master.py | 3 | ||||
| -rw-r--r-- | ipaserver/install/plugins/updateclient.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ipaserver/install/plugins/ca_renewal_master.py b/ipaserver/install/plugins/ca_renewal_master.py index b2a7ba7cc..37b5487fe 100644 --- a/ipaserver/install/plugins/ca_renewal_master.py +++ b/ipaserver/install/plugins/ca_renewal_master.py @@ -22,6 +22,7 @@ from ipaserver.install import installutils, certs, cainstance from ipalib import errors from ipalib.plugable import Registry from ipapython import certmonger, dogtag +from ipaplatform.paths import paths from ipapython.dn import DN register = Registry() @@ -52,7 +53,7 @@ class update_ca_renewal_master(PostUpdate): return (False, False, []) criteria = ( - ('cert_storage_location', '/etc/httpd/alias', certmonger.NPATH), + ('cert_storage_location', paths.HTTPD_ALIAS_DIR, certmonger.NPATH), ('cert_nickname', 'ipaCert', None), ) request_id = certmonger.get_request_id(criteria) diff --git a/ipaserver/install/plugins/updateclient.py b/ipaserver/install/plugins/updateclient.py index a4bc79238..7566b6cd8 100644 --- a/ipaserver/install/plugins/updateclient.py +++ b/ipaserver/install/plugins/updateclient.py @@ -22,6 +22,7 @@ from ipaserver.install.ldapupdate import LDAPUpdate from ipapython.ipautil import wait_for_open_socket from ipalib import api from ipalib import backend +from ipaplatform.paths import paths from ipapython.dn import DN class updateclient(backend.Executioner): @@ -143,7 +144,7 @@ class updateclient(backend.Executioner): def restart(self, dm_password, live_run): dsrestart = DSRestart() - socket_name = '/var/run/slapd-%s.socket' % \ + socket_name = paths.SLAPD_INSTANCE_SOCKET_TEMPLATE % \ api.env.realm.replace('.','-') if live_run: self.destroy_context() |