summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/service.py
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2010-12-10 14:53:06 -0500
committerRob Crittenden <rcritten@redhat.com>2010-12-10 23:09:41 -0500
commit95c4b894f93619ed2867d1a769ed3c9f512b890c (patch)
treea5115e46865a35372e5a0be0c01b4d1737ae7f40 /ipaserver/install/service.py
parent8fd288df08d8f01893ad9637adc8987032af1886 (diff)
downloadfreeipa-95c4b894f93619ed2867d1a769ed3c9f512b890c.tar.gz
freeipa-95c4b894f93619ed2867d1a769ed3c9f512b890c.tar.xz
freeipa-95c4b894f93619ed2867d1a769ed3c9f512b890c.zip
Fix Install using dogtag.
The CA is installed before DS so we need to wait until DS is actually installed to be able to ldap_enable the CA instance. Fixes: https://fedorahosted.org/freeipa/ticket/612
Diffstat (limited to 'ipaserver/install/service.py')
-rw-r--r--ipaserver/install/service.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index 41b5455d3..281981d1c 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -34,7 +34,7 @@ SERVICE_LIST = {
'KPASSWD':('ipa_kpasswd', 20),
'DNS':('named', 30),
'HTTP':('httpd', 40),
- 'CA':('pki_cad', 50)
+ 'CA':('pki-cad', 50)
}
def stop(service_name, instance_name=""):
@@ -270,19 +270,19 @@ class Service:
self.steps = []
- def __get_conn(self, dm_password):
+ def __get_conn(self, fqdn, dm_password):
try:
conn = ipaldap.IPAdmin("127.0.0.1")
conn.simple_bind_s("cn=directory manager", dm_password)
except Exception, e:
- logging.critical("Could not connect to the Directory Server on %s: %s" % (self.fqdn, str(e)))
+ logging.critical("Could not connect to the Directory Server on %s: %s" % (fqdn, str(e)))
raise e
return conn
def ldap_enable(self, name, fqdn, dm_password, ldap_suffix):
self.chkconfig_off()
- conn = self.__get_conn(dm_password)
+ conn = self.__get_conn(fqdn, dm_password)
entry_name = "cn=%s,cn=%s,%s,%s" % (name, fqdn,
"cn=masters,cn=ipa,cn=etc",