[Cluster-devel] cluster/rgmanager/src/resources apache.sh
mgrac at sourceware.org
mgrac at sourceware.org
Wed Sep 20 08:50:13 UTC 2006
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: mgrac at sourceware.org 2006-09-20 08:50:12
Modified files:
rgmanager/src/resources: apache.sh
Log message:
After upgrade to 'unified names for PID files' we can clean code a bit.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/apache.sh.diff?cvsroot=cluster&r1=1.4&r2=1.5
--- cluster/rgmanager/src/resources/apache.sh 2006/09/20 08:07:04 1.4
+++ cluster/rgmanager/src/resources/apache.sh 2006/09/20 08:50:12 1.5
@@ -39,35 +39,6 @@
declare APACHE_parseConfig=$(dirname $0)/utils/httpd-parse-config.pl
-apache_pidFile()
-{
- declare tmpFile="/tmp/httpd.$OCF_RESKEY_name.$$"
- declare CFG_serverRoot
-
- if [ -f "$APACHE_genConfig" ]; then
- sha1_verify "$APACHE_genConfig"
- if [ $? -ne 0 ]; then
- ocf_log debug "Config file changed; skipping"
- cp "$APACHE_genConfig" "$tmpFile"
- else
- generate_configFile "$APACHE_serverConfigFile" "$tmpFile"
- fi
- else
- generate_configFile "$APACHE_serverConfigFile" "$tmpFile"
- fi
-
- CFG_serverRoot=`grep -e '^ServerRoot' "$tmpFile" | head -n 1 | \
- sed 's/^ServerRoot "\(.*\)"/\1/;s/^ServerRoot \(.*\)/\1/'`
-
- if [ -z "$CFG_serverRoot" ]; then
- CFG_serverRoot="$OCF_RESKEY_server_root"
- fi
-
- rm -f "$tmpFile"
-
- return;
-}
-
apache_serverConfigFile()
{
if [[ "$OCF_RESKEY_config_file" =~ '^/' ]]; then
@@ -256,7 +227,6 @@
if [ "$1" != "meta-data" ]; then
apache_serverConfigFile
- apache_pidFile
fi;
case $1 in
More information about the Cluster-devel
mailing list