diff options
| author | Ade Lee <alee@redhat.com> | 2012-08-15 22:53:51 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-09-17 18:43:36 -0400 |
| commit | 3dd31a875650c7fe7c67ca6b47f2058c1181dafb (patch) | |
| tree | 137f46dfe1684ebcbd6e9e70ef3c5a690ab32d07 /ipapython | |
| parent | 79b89f41962985cf0ab96238b21409b5874f67f8 (diff) | |
| download | freeipa-3dd31a875650c7fe7c67ca6b47f2058c1181dafb.tar.gz freeipa-3dd31a875650c7fe7c67ca6b47f2058c1181dafb.tar.xz freeipa-3dd31a875650c7fe7c67ca6b47f2058c1181dafb.zip | |
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
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/certmonger.py | 2 | ||||
| -rw-r--r-- | ipapython/platform/base.py | 7 | ||||
| -rw-r--r-- | ipapython/platform/fedora16.py | 7 | ||||
| -rw-r--r-- | ipapython/platform/systemd.py | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/ipapython/certmonger.py b/ipapython/certmonger.py index bdc8591e7..7f88a05d0 100644 --- a/ipapython/certmonger.py +++ b/ipapython/certmonger.py @@ -337,7 +337,7 @@ def get_pin(token): The caller is expected to handle any exceptions raised. """ - filename = '/var/lib/pki-ca/conf/password.conf' + filename = '/var/lib/pki/pki-tomcat/conf/password.conf' with open(filename, 'r') as f: for line in f: (tok, pin) = line.split('=', 1) diff --git a/ipapython/platform/base.py b/ipapython/platform/base.py index 8c694ac04..b71e2f323 100644 --- a/ipapython/platform/base.py +++ b/ipapython/platform/base.py @@ -25,7 +25,7 @@ from ipalib.plugable import MagicDict wellknownservices = ['certmonger', 'dirsrv', 'httpd', 'ipa', 'krb5kdc', 'messagebus', 'nslcd', 'nscd', 'ntpd', 'portmap', 'rpcbind', 'kadmin', 'sshd', 'autofs', 'rpcgssd', - 'rpcidmapd', 'pki_cad'] + 'rpcidmapd', 'pki_tomcatd', 'pki-cad'] # The common ports for these services. This is used to wait for the @@ -34,7 +34,10 @@ wellknownports = { 'dirsrv@PKI-IPA.service': [7389], 'PKI-IPA': [7389], 'dirsrv': [389], # this is only used if the incoming instance name is blank - 'pki-cad': [9180], + 'pki-tomcatd@pki-tomcat.service': [8080], + 'pki-tomcat': [8080], + 'pki-tomcatd': [8080], # used if the incoming instance name is blank + 'pki-cad': [9180] } class AuthConfig(object): diff --git a/ipapython/platform/fedora16.py b/ipapython/platform/fedora16.py index 100bbb2ab..794c39e20 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): diff --git a/ipapython/platform/systemd.py b/ipapython/platform/systemd.py index a233e1045..c174488c0 100644 --- a/ipapython/platform/systemd.py +++ b/ipapython/platform/systemd.py @@ -41,10 +41,10 @@ class SystemdService(base.PlatformService): # Short-cut: if there is already exact service name, return it if self.lib_path_exists and len(instance_name) == 0: if len(elements) == 1: - # service name is like pki-cad.target or krb5kdc.service + # service name is like pki-tomcatd.target or krb5kdc.service return self.service_name if len(elements) > 1 and elements[1][0] != '.': - # Service name is like pki-cad@pki-ca.service and that file exists + # Service name is like pki-tomcatd@pki-tomcat.service and that file exists return self.service_name if len(elements) > 1: |