From 1ca499dc515bd947207452cfd34e965af7d5ff16 Mon Sep 17 00:00:00 2001 From: Andy Witter <awitter@georgialibraries.org> Date: Fri, 1 Sep 2017 09:27:42 -0400 Subject: [PATCH] Update the way we modify oils_sip.xml to account for stock SIPconfig.xml --- GenaSYS.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/GenaSYS.sh b/GenaSYS.sh index deb15be..3655073 100755 --- a/GenaSYS.sh +++ b/GenaSYS.sh @@ -25,8 +25,8 @@ PURPOSE_="Generate config files needed for Evergreen-ILS Cluster" SYNOPSIS_="$NAME_" REQUIRES_="standard GNU commands, apt, dpkg" - VERSION_="1.83" - DATE_="2010-11-23; last update: 2017-08-31" + VERSION_="1.84" + DATE_="2010-11-23; last update: 2017-09-01" AUTHOR_="Andy Witter <awitter@georgialibraries.org>" URL_="http://evergreen-ils.org" CATEGORY_="devel" @@ -2649,7 +2649,9 @@ echo "Setting up SIP.." if [ -e "${CUSTOMDIR}/oils_sip.xml" ] then cp -f "${CUSTOMDIR}/oils_sip.xml" "${TMPFOLDER}" - sed -i "/<\/listeners>/a \\\t<\!-- One or more Memecache servers are required for Mulitplex mode. -->\n\t<\!-- Cache server(s) are ignored in non-Multiplex mode -->\n\t<cache>\n\t\ \<server>$MEMCACHE01_IP:11211</server>\n\t\ \<server>$MEMCACHE02_IP:11211</server>\n\t</cache>" "${TMPFOLDER}/oils_sip.xml" + #sed -i "/<\/listeners>/a \\\t<\!-- One or more Memecache servers are required for Mulitplex mode. -->\n\t<\!-- Cache server(s) are ignored in non-Multiplex mode -->\n\t<cache>\n\t\ \<server>$MEMCACHE01_IP:11211</server>\n\t\ \<server>$MEMCACHE02_IP:11211</server>\n\t</cache>" "${TMPFOLDER}/oils_sip.xml" + sed -i "/<server>/d" $SIP_XML + sed -i "/<cache>/a \\\t<server>$MEMCACHE01_IP:11211</server>\n\t<server>$MEMCACHE02_IP:11211</server>" "$SIP_XML" else echo echo -e ${COL_RED} "WARNING!!" ${COL_RESET} ${COL_GREEN} "oils_sip.xml" ${COL_RESET} "was not found in ${CUSTOMDIR}" -- 2.11.0