From 643c089887db3369363e2b88dde19ef3a97029a2 Mon Sep 17 00:00:00 2001
From: Ade Lee <alee@redhat.com>
Date: Wed, 17 Oct 2012 16:17:54 -0400
Subject: Fixes to get TPS to configure correctly

1. Reorder http.conf to actually read worker config
2. Change functions so that the TPS would restart.  Before restarts
   would fail because the tus link already exists
3. Modify system verification test to return correctly when tests
   are successful
---
 base/setup/scripts/functions | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'base/setup/scripts/functions')

diff --git a/base/setup/scripts/functions b/base/setup/scripts/functions
index 308f2ca80..058022efc 100644
--- a/base/setup/scripts/functions
+++ b/base/setup/scripts/functions
@@ -897,6 +897,7 @@ verify_symlinks()
     declare -A common_jar_symlinks
     declare -A webapps_jar_symlinks
     declare -A systemd_symlinks
+    declare -A tus_symlinks
 
     # Dogtag 9 Conditional Variables
     if [ ${ARCHITECTURE} == "x86_64" ]; then
@@ -949,6 +950,9 @@ verify_symlinks()
     # '${PKI_INSTANCE_PATH}/lib' symlinks
     perl_symlinks[perl]=/usr/share/pki/${PKI_SUBSYSTEM_TYPE}/lib/perl
 
+    # '${PKI_INSTANCE_PATH}/docroot' symlinks
+    tus_symlinks[tus]="${PKI_INSTANCE_PATH}/docroot/tokendb"
+
     # '${pki_common_jar_dir}' symlinks
     common_jar_symlinks=(
         [apache-commons-logging.jar]=/usr/share/java/apache-commons-logging.jar
@@ -1017,20 +1021,16 @@ verify_symlinks()
         fi
 
         if [ "${PKI_SUBSYSTEM_TYPE}" == "tps"  ]; then
-            # ALWAYS recreate this "convenience" link and 'chown' it
-            # NOTE:  Ignore 'chown' errors.
-            cd ${PKI_INSTANCE_PATH}/docroot ;
-            ln -s tokendb tus ;
+            # Detect and correct 'tus_symlinks'
+            tus_symlinks_string=$(declare -p tus_symlinks)
+            eval "declare -A symlinks=${tus_symlinks_string#*=}"
+            check_symlinks ${PKI_INSTANCE_PATH}/docroot ${PKI_USER} ${PKI_GROUP}
             rv=$?
-            if [ $rv -eq 0 ]; then
-                chown -h ${PKI_USER}:${PKI_GROUP} tus
-                # echo "SUCCESS:  Created 'tus' -> 'tokendb'"
-            else
-                echo "ERROR:  Failed to create 'tus' -> 'tokendb' convenience"
-                echo "        symbolic link for '${PKI_INSTANCE_ID}'!"
-                return 1
+            if [ $rv -ne 0 ]; then
+                return $rv
             fi
         fi
+
     elif [ "${PKI_SUBSYSTEM_TYPE}" == "ca"   ]  ||
          [ "${PKI_SUBSYSTEM_TYPE}" == "kra"  ]  ||
          [ "${PKI_SUBSYSTEM_TYPE}" == "ocsp" ]  ||
-- 
cgit