From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31458 invoked by alias); 21 May 2009 14:37:51 -0000 Received: (qmail 31452 invoked by alias); 21 May 2009 14:37:51 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: RHEL5 - apache.sh: #489785 - does not handle a valid /etc/httpd/conf/httpd.conf configuration correctly To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: 684b86aa704e5a7316c17501eb9d3e2f59d681b5 X-Git-Newrev: 6c5b992c1e13cea8b4479da8d252366ba7e285c6 From: =?utf-8?q?Marek_Gr=C3=A1c?= Message-Id: <20090521143723.9472B1201FA@lists.fedorahosted.org> Date: Thu, 21 May 2009 14:37:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00367.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6c5b992c1e13cea8b4479da8d252366ba7e285c6 Commit: 6c5b992c1e13cea8b4479da8d252366ba7e285c6 Parent: 684b86aa704e5a7316c17501eb9d3e2f59d681b5 Author: Marek 'marx' Grac AuthorDate: Thu May 21 16:33:53 2009 +0200 Committer: Marek 'marx' Grac CommitterDate: Thu May 21 16:33:53 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 5132ff2..03ffb9f 100755 --- a/rgmanager/src/resources/apache.sh +++ b/rgmanager/src/resources/apache.sh @@ -135,8 +135,12 @@ EOT IFS_old="$IFS" IFS=$'\n' - for i in `"$APACHE_parseConfig" -D"$OCF_RESKEY_name" < "$originalConfigFile" | grep -P '(^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";