From 3dd31a875650c7fe7c67ca6b47f2058c1181dafb Mon Sep 17 00:00:00 2001
From: Ade Lee <alee@redhat.com>
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
---
 ipaserver/install/service.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'ipaserver/install/service.py')

diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index dcfcbc27f..e15d4e5e0 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -41,6 +41,17 @@ AUTO = 1
 ENABLED = 2
 DISABLED = 3
 
+# Determine if we have an updated dogtag instance (dogtag 10+) or
+# an older one.
+dogtag_service = 'pki-cad'
+try:
+    for line in open("/etc/ipa/default.conf", "r"):
+        if "dogtag_version" in line:
+            dogtag_service = 'pki-tomcatd'
+            break
+except IOError, e:
+    pass
+
 # The service name as stored in cn=masters,cn=ipa,cn=etc. In the tuple
 # the first value is the *nix service name, the second the start order.
 SERVICE_LIST = {
@@ -49,7 +60,7 @@ SERVICE_LIST = {
     'DNS':('named', 30),
     'MEMCACHE':('ipa_memcached', 39),
     'HTTP':('httpd', 40),
-    'CA':('pki-cad', 50),
+    'CA':(dogtag_service, 50),
     'ADTRUST':('smb', 60),
     'EXTID':('winbind', 70)
 }
-- 
cgit