From 3dd31a875650c7fe7c67ca6b47f2058c1181dafb Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Wed, 15 Aug 2012 22:53:51 -0400 Subject: Modifications to install scripts for dogtag 10 Dogtag 10 uses a new installer, new directory layout and new default ports. This patch changes the ipa install code to integrate these changes. https://fedorahosted.org/freeipa/ticket/2846 --- ipapython/platform/fedora16.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'ipapython/platform/fedora16.py') diff --git a/ipapython/platform/fedora16.py b/ipapython/platform/fedora16.py index 100bbb2a..794c39e2 100644 --- a/ipapython/platform/fedora16.py +++ b/ipapython/platform/fedora16.py @@ -46,7 +46,7 @@ system_units = dict(map(lambda x: (x, "%s.service" % (x)), base.wellknownservice system_units['rpcgssd'] = 'nfs-secure.service' system_units['rpcidmapd'] = 'nfs-idmap.service' -# Rewrite dirsrv and pki-cad services as they support instances via separate +# Rewrite dirsrv and pki-tomcatd services as they support instances via separate # service generator. To make this working, one needs to have both foo@.servic # and foo.target -- the latter is used when request should be coming for # all instances (like stop). systemd, unfortunately, does not allow one @@ -58,9 +58,12 @@ system_units['rpcidmapd'] = 'nfs-idmap.service' system_units['dirsrv'] = 'dirsrv@.service' # Our directory server instance for PKI is dirsrv@PKI-IPA.service system_units['pkids'] = 'dirsrv@PKI-IPA.service' -# Our PKI instance is pki-cad@pki-ca.service +# Old style PKI instance system_units['pki-cad'] = 'pki-cad@pki-ca.service' system_units['pki_cad'] = system_units['pki-cad'] +# Our PKI instance is pki-tomcatd@pki-tomcat.service +system_units['pki-tomcatd'] = 'pki-tomcatd@pki-tomcat.service' +system_units['pki_tomcatd'] = system_units['pki-tomcatd'] class Fedora16Service(systemd.SystemdService): def __init__(self, service_name): -- cgit