IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-24 16:10:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change the service name to reflect changes in pki-ca (now pki-cad).

Browse Source 
Also properly use the instance name where appropriate. There were a
couple of places where the service name was used and this worked because
they were the same.
This commit is contained in:
Rob Crittenden 2010-01-06 17:20:17 -05:00
parent ee446ff148
commit 6d88fd6404
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipaserver/install/cainstance.py
View File

@ -381,7 +381,7 @@ class CAInstance(service.Service):
"""
def __init__(self):
service.Service.__init__(self, "pki-ca")
service.Service.__init__(self, "pki-cad")
self.pki_user = "pkiuser"
self.dm_password = None
self.admin_password = None
@ -524,7 +524,7 @@ class CAInstance(service.Service):
except ipautil.CalledProcessError, e:
print "failed to restart ca instance", e
preop_pin = get_preop_pin(self.server_root, self.service_name)
preop_pin = get_preop_pin(self.server_root, PKI_INSTANCE_NAME)
try:
args = ["/usr/bin/perl", "/usr/bin/pkisilent", "ConfigureCA",
@ -1003,7 +1003,7 @@ class CAInstance(service.Service):
def uninstall(self):
try:
ipautil.run(["/usr/bin/pkiremove", "-pki_instance_root=/var/lib",
"-pki_instance_name=pki-ca", "--force"])
"-pki_instance_name=%s" % PKI_INSTANCE_NAME, "--force"])
except ipautil.CalledProcessError, e:
logging.critical("failed to uninstall CA instance %s" % e)