From 768c3203a3ab5f2bd11dd8e271c111c62ea06af1 Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Tue, 11 Dec 2012 11:41:29 -0500 Subject: [PATCH] adding hostname prefix handling for opensrf.xml and postfix config --- GenaSYS.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/GenaSYS.sh b/GenaSYS.sh index 3d1346a..fc25f26 100755 --- a/GenaSYS.sh +++ b/GenaSYS.sh @@ -1040,7 +1040,11 @@ for LVS in $MACHINES_LVS_ONLY cp -f "$TEMPLATEDIR/lvs/resolv.conf" "$OUTDIR/$LVS/etc" cp -f "$TEMPLATEDIR/lvs/main.cf" "$OUTDIR/$LVS/etc/postfix" sed -i "s^CLUSTER_DOMAIN_NAME^$CLUSTERDOMAINNAME^g" "$OUTDIR/$LVS/etc/resolv.conf" - sed -i "s^ClusterDomainName^$CLUSTERDOMAINNAME^g" "$OUTDIR/$LVS/etc/postfix/main.cf" + if [ -n "$HOSTNAME_PREFIX" ]; then + sed -i "s^\(myhostname = \)\([A-Za-z0-9-]*\.ClusterDomainName\)^\1$HOSTNAME_PREFIX-\2^g" "$OUTDIR/$LVS/etc/postfix/main.cf" + sed -i "s^\(mydestination = \)\([A-Za-z0-9-]*\.ClusterDomainName\)^\1$HOSTNAME_PREFIX-\2^g" "$OUTDIR/$LVS/etc/postfix/main.cf" + fi + sed -i "s^ClusterDomainName^$CLUSTERDOMAINNAME^g" "$OUTDIR/$LVS/etc/postfix/main.cf" sed -i "s^Priv_NET^${PRIVATENET}^g" "$OUTDIR/$LVS/etc/network/iptables-rules.fw" sed -i "s^Priv_NET^${PRIVATENET}^g" "$OUTDIR/$LVS/etc/postfix/main.cf" sed -i "s^Pub_BCAST^${PUB_BCAST}^g" "$OUTDIR/$LVS/etc/network/iptables-rules.fw" @@ -1180,7 +1184,11 @@ NETCFGFILE="$OUTDIR/${CLUSTERDOMAINNAME}_network_config.txt" ## begin preparation of opensrf.xml cp $TEMPLATEDIR/opensrf.xml/opensrf.xml-header $TMPOPENSRF_XML sed -i "s^DatabasePassword^$DATABASE_PASSWORD^g" $TMPOPENSRF_XML -sed -i "s^DatabaseHostName^db01^g" $TMPOPENSRF_XML +# the below line appears to not be doing anything +# sed -i "s^DatabaseHostName^db01^g" $TMPOPENSRF_XML +if [ -n "$HOSTNAME_PREFIX" ]; then + sed -i "s^>\([A-Za-z0-9-]*\.ClusterDomainName\)^>$HOSTNAME_PREFIX-\1^g" $TMPOPENSRF_XML +fi sed -i "s^ClusterDomainName^$CLUSTERDOMAINNAME^g" $TMPOPENSRF_XML sed -i "s^memcache01_IP^$MEMCACHE01_IP^g" $TMPOPENSRF_XML sed -i "s^memcache02_IP^$MEMCACHE02_IP^g" $TMPOPENSRF_XML -- 2.11.0