From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7517 invoked by alias); 22 May 2009 14:33:36 -0000 Received: (qmail 7507 invoked by alias); 22 May 2009 14:33:35 -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: resource-agents: master - apache.sh: #489785 - apache.sh does not handle a valid httpd.conf To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: resource-agents.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ba88b234533d30f3324fa11f5c0bcb1ae8ab0330 X-Git-Newrev: cabe091d4603d93b9571ebc3ee7f848f2e633066 From: =?utf-8?q?Marek_Gr=C3=A1c?= Message-Id: <20090522143307.4681A1201ED@lists.fedorahosted.org> Date: Fri, 22 May 2009 14:33: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/msg00387.txt.bz2 Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a=commitdiff;h=cabe091d4603d93b9571ebc3ee7f848f2e633066 Commit: cabe091d4603d93b9571ebc3ee7f848f2e633066 Parent: ba88b234533d30f3324fa11f5c0bcb1ae8ab0330 Author: Marek 'marx' Grac AuthorDate: Fri May 22 16:27:52 2009 +0200 Committer: Marek 'marx' Grac CommitterDate: Fri May 22 16:30:07 2009 +0200 apache.sh: #489785 - apache.sh does not handle a valid httpd.conf --- 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 7f86838..bb225aa 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";