From b57ddf7856340bfe94034b34e8d0bbd9b6b3a63a Mon Sep 17 00:00:00 2001 From: Michael Peters Date: Thu, 17 Jul 2014 14:25:50 -0400 Subject: [PATCH] Remove incomplete database prefixing functionality from 075e995a4a We were tinkering with database prefix functionality and it snuck in when we pushed GenaSYS 2.6.0, breaking further versions. This removes the functionality as it is not yet completed. --- GenaSYS.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/GenaSYS.sh b/GenaSYS.sh index 4a03b10..80a0fbc 100755 --- a/GenaSYS.sh +++ b/GenaSYS.sh @@ -1677,10 +1677,6 @@ NETCFGFILE="$OUTDIR/${CLUSTERDOMAINNAME}_network_config.txt" ## begin preparation of opensrf.xml cp $TEMPLATEDIR/opensrf.xml/opensrf.xml-header $TMPOPENSRF_XML -if [ "$USE_HOSTNAME_PREFIX" = "y" ] || [ "$USE_HOSTNAME_PREFIX" = "Y" ] -then - sed -i "s^evergreen^${PREFIX}_evergreen^g" $TMPOPENSRF_XML -fi #sed -i "s^DatabasePassword^$DATABASE_PASSWORD^g" $TMPOPENSRF_XML sed -i "s^DatabasePassword^$(echo $DATABASE_PASSWORD | sed -e 's^&^\\\&^g' -e 's/\^/\\\^/g')^g" $TMPOPENSRF_XML # the below line appears to not be doing anything -- 2.11.0