Blob Blame History Raw
From ed5044ffc209e842c000d1c47980de6e0ab8e52a Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Mon, 26 Jan 2015 10:39:48 +0000
Subject: [PATCH] Create correct log directories during full restore in
 ipa-restore

https://fedorahosted.org/freeipa/ticket/4865

Reviewed-By: Martin Kosek <mkosek@redhat.com>
---
 ipaserver/install/ipa_restore.py | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
index 562a793c2c9383d7495c84a817ac9f7a1407f9bb..6de73e640d101a72aacc7ce73a6937c222da4ebb 100644
--- a/ipaserver/install/ipa_restore.py
+++ b/ipaserver/install/ipa_restore.py
@@ -713,22 +713,21 @@ class Restore(admintool.AdminTool):
         not exist then tomcat will fail to start.
 
         The directory is different depending on whether we have a d9-based
-        or a d10-based installation. We can tell based on whether there is
-        a PKI-IPA 389-ds instance.
+        or a d10-based installation.
         """
-        if os.path.exists(paths.ETC_SLAPD_PKI_IPA_DIR): # dogtag 9
-            topdir = paths.PKI_CA_LOG_DIR
-            dirs = [topdir,
-                    '/var/log/pki-ca/signedAudit,']
-        else: # dogtag 10
-            topdir = paths.TOMCAT_TOPLEVEL_DIR
-            dirs = [topdir,
-                    paths.TOMCAT_CA_DIR,
-                    paths.TOMCAT_CA_ARCHIVE_DIR,
-                    paths.TOMCAT_SIGNEDAUDIT_DIR,]
-
-        if os.path.exists(topdir):
-            return
+        dirs = []
+        # dogtag 9
+        if (os.path.exists(paths.VAR_LIB_PKI_CA_DIR) and
+                not os.path.exists(paths.PKI_CA_LOG_DIR)):
+            dirs += [paths.PKI_CA_LOG_DIR,
+                     os.path.join(paths.PKI_CA_LOG_DIR, 'signedAudit')]
+        # dogtag 10
+        if (os.path.exists(paths.VAR_LIB_PKI_TOMCAT_DIR) and
+                not os.path.exists(paths.TOMCAT_TOPLEVEL_DIR)):
+            dirs += [paths.TOMCAT_TOPLEVEL_DIR,
+                     paths.TOMCAT_CA_DIR,
+                     paths.TOMCAT_CA_ARCHIVE_DIR,
+                     paths.TOMCAT_SIGNEDAUDIT_DIR]
 
         try:
             pent = pwd.getpwnam(PKI_USER)
-- 
2.1.0