cluster: STABLE2 - apache.sh: #489785 - does not handle a valid /etc/httpd/conf/httpd.conf configuration correctly

cluster: STABLE2 - apache.sh: #489785 - does not handle a valid /etc/httpd/conf/httpd.conf configuration correctly

[Marek Grác]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=03d0e4a60ab009ba3a21745caafaadb78249adc1
Commit:        03d0e4a60ab009ba3a21745caafaadb78249adc1
Parent:        a9010ac82a760ea0bf4506050e456745daf963b9
Author:        Marek 'marx' Grac <mgrac@redhat.com>
AuthorDate:    Fri May 22 16:24:38 2009 +0200
Committer:     Marek 'marx' Grac <mgrac@redhat.com>
CommitterDate: Fri May 22 16:24:38 2009 +0200

apache.sh: #489785 - does not handle a valid /etc/httpd/conf/httpd.conf configuration correctly

---
 rgmanager/src/resources/apache.sh |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/resources/apache.sh b/rgmanager/src/resources/apache.sh
index 0573a38..f0ac7c0 100644
--- a/rgmanager/src/resources/apache.sh
+++ b/rgmanager/src/resources/apache.sh
@@ -116,8 +116,12 @@ EOT
 
 	IFS_old="$IFS"
 	IFS=$'\n'
-	for i in `"$APACHE_parseConfig" -D"$OCF_RESKEY_name" < "$originalConfigFile" | grep -E '(^Listen)|(^Port)' | grep -v ':'`; do 
+	for i in `"$APACHE_parseConfig" -D"$OCF_RESKEY_name" < "$originalConfigFile" | grep -P '(^Listen)|(^Port)' `; do 
 		port=`echo $i | sed 's/^Listen \(.*\)/\1/;s/^Port \(.*\)/\1/'`;
+		testcond=`echo $port|grep :`
+		if [ $testcond ]; then
+			port=`echo $port|awk -F : '{print $2}'`
+		fi
 		IFS=$' ';
 		for z in $ip_addresses; do 
 			echo "Listen $z:$port" >> "$generatedConfigFile";