mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
ipaplatform: Move all filesystem paths to ipaplatform.paths module
https://fedorahosted.org/freeipa/ticket/4052 Reviewed-By: Petr Viktorin <pviktori@redhat.com>
This commit is contained in:
committed by
Petr Viktorin
parent
c7edd7b68c
commit
4d2ef43f28
@@ -1212,6 +1212,7 @@ from ipalib.constants import TYPE_ERROR
|
||||
from ipalib.util import cachedproperty
|
||||
from ipapython import dogtag
|
||||
from ipalib import _
|
||||
from ipaplatform.paths import paths
|
||||
|
||||
class ra(rabase.rabase):
|
||||
"""
|
||||
@@ -1222,8 +1223,8 @@ class ra(rabase.rabase):
|
||||
self.sec_dir = api.env.dot_ipa + os.sep + 'alias'
|
||||
self.pwd_file = self.sec_dir + os.sep + '.pwd'
|
||||
else:
|
||||
self.sec_dir = "/etc/httpd/alias"
|
||||
self.pwd_file = "/etc/httpd/alias/pwdfile.txt"
|
||||
self.sec_dir = paths.HTTPD_ALIAS_DIR
|
||||
self.pwd_file = paths.ALIAS_PWDFILE_TXT
|
||||
self.noise_file = self.sec_dir + os.sep + '.noise'
|
||||
self.ipa_key_size = "2048"
|
||||
self.ipa_certificate_nickname = "ipaCert"
|
||||
|
||||
@@ -35,6 +35,7 @@ from ipalib import Backend
|
||||
from ipalib import errors
|
||||
from ipaserver.install import certs
|
||||
import os
|
||||
from ipaplatform.paths import paths
|
||||
|
||||
class rabase(Backend):
|
||||
"""
|
||||
@@ -45,8 +46,8 @@ class rabase(Backend):
|
||||
self.sec_dir = api.env.dot_ipa + os.sep + 'alias'
|
||||
self.pwd_file = self.sec_dir + os.sep + '.pwd'
|
||||
else:
|
||||
self.sec_dir = "/etc/httpd/alias"
|
||||
self.pwd_file = "/etc/httpd/alias/pwdfile.txt"
|
||||
self.sec_dir = paths.HTTPD_ALIAS_DIR
|
||||
self.pwd_file = paths.ALIAS_PWDFILE_TXT
|
||||
super(rabase, self).__init__()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user