Hello community,
here is the log from the commit of package heartbeat
checked in at Fri Nov 21 15:21:13 CET 2008.
--------
--- heartbeat/heartbeat.changes 2008-10-28 17:35:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/heartbeat/heartbeat.changes 2008-11-21 13:15:33.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Nov 21 13:00:00 CET 2008 - lmb@suse.de
+
+- hb_report: many fixes and improvements.
+- stonith: kdumpcheck: improve parsing for kdump_check_user.
+- RA: Squid: support the Squid proxy server as a service.
+- RA: drbd: Minor bugs and bash issues fixed.
+- CCM: Avoid passing NULL to glib functions using GHashTable.
+- Build fixes (LF#1977, LF#1976, LF#1980).
+- CTS: Move heartbeat-v1 resources to heartbeat-resources (bnc#446667).
+- Patch heartbeat-doc-directory.diff is now redundant.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
heartbeat-doc-directory.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ heartbeat.spec ++++++
--- /var/tmp/diff_new_pack.v28350/_old 2008-11-21 15:20:56.000000000 +0100
+++ /var/tmp/diff_new_pack.v28350/_new 2008-11-21 15:20:56.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package heartbeat (Version 2.99.2)
+# spec file for package heartbeat (Version 2.99.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -36,8 +36,8 @@
Name: heartbeat
Summary: The Heartbeat Subsystem for High-Availability Linux
-Version: 2.99.2
-Release: 2
+Version: 2.99.3
+Release: 1
License: GPL v2 or later; LGPL v2.1 or later
Url: http://linux-ha.org/
Group: Productivity/Clustering/HA
@@ -45,7 +45,6 @@
Source1: heartbeat.suse.in
Source2: ldirectord.suse.in
Source100: heartbeat.rpmlintrc
-Patch1: heartbeat-doc-directory.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-common = %{version}-%{release}
Requires: %{name}-resources = %{version}-%{release}
@@ -60,6 +59,7 @@
BuildRequires: OpenIPMI-devel bison flex gdbm-devel libnet
PreReq: %insserv_prereq %fillup_prereq
Requires(pre): /usr/sbin/groupadd /usr/bin/getent /usr/sbin/useradd
+Requires: logrotate
%define nogroup nogroup
%define SSLeay perl-Net_SSLeay
%if 0%{?suse_version} >= 1100
@@ -288,6 +288,9 @@
Summary: A Monitoring Daemon for Maintaining High Availability Resources
Group: Productivity/Clustering/HA
Requires: %{SSLeay} perl-libwww-perl ipvsadm
+%if 0%{?suse_version}
+Requires: logrotate
+%endif
%if 0%{?fedora_version}
Requires(post): /sbin/chkconfig
Requires(preun):/sbin/chkconfig
@@ -381,7 +384,6 @@
%prep
###########################################################
%setup -n heartbeat
-%patch1 -p0
%if 0%{?suse_version}
cp $RPM_SOURCE_DIR/heartbeat.suse.in ./heartbeat/init.d/heartbeat.in
cp $RPM_SOURCE_DIR/ldirectord.suse.in ./ldirectord/init.d/ldirectord.in
@@ -458,6 +460,11 @@
find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f
chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs
chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
+# EVMS2 is finally gone from 11.1 and later, no need to include
+# confusing RAs.
+%if 0%{?suse_version} > 1100
+rm -f $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/heartbeat/Evms*
+%endif
###########################################################
%clean
@@ -576,8 +583,6 @@
%{_libdir}/heartbeat/plugins/test
%{_libdir}/heartbeat/plugins/tiebreaker
#%{_libdir}/heartbeat/quorumd
-%{_libdir}/heartbeat/ha_*
-%{_libdir}/heartbeat/hb_*
%{_libdir}/heartbeat/heartbeat
%{_libdir}/heartbeat/ipfail
%{_libdir}/heartbeat/ccm
@@ -602,28 +607,26 @@
#%exclude %{_libdir}/heartbeat/ResourceManager
%exclude %{_libdir}/heartbeat/lrmtest
%exclude %{_libdir}/heartbeat/cts
-# Exclude V1 Compatability symlinks - disabled for now...
-#%exclude %{_libdir}/heartbeat/hb_setweight
-#%exclude %{_libdir}/heartbeat/hb_standby
-#%exclude %{_libdir}/heartbeat/hb_takeover
-#%exclude %{_libdir}/heartbeat/mach_down
-#%exclude %{_libdir}/heartbeat/req_resource
-# Exclude V2 Compatability symlinks - disabled for now...
-#%exclude %{_libdir}/heartbeat/hb_addnode
-#%exclude %{_libdir}/heartbeat/hb_delnode
-#%exclude %{_libdir}/heartbeat/ha_config
-#%exclude %{_libdir}/heartbeat/ha_logger
-#%exclude %{_libdir}/heartbeat/hb_setsite
-#%exclude %{_libdir}/heartbeat/ha_propagate
+%exclude %{_libdir}/heartbeat/hb_setweight
+%exclude %{_libdir}/heartbeat/hb_standby
+%exclude %{_libdir}/heartbeat/hb_takeover
+%exclude %{_libdir}/heartbeat/mach_down
+%exclude %{_libdir}/heartbeat/req_resource
+%exclude %{_libdir}/heartbeat/hb_addnode
+%exclude %{_libdir}/heartbeat/hb_delnode
+%exclude %{_libdir}/heartbeat/ha_config
+%exclude %{_libdir}/heartbeat/ha_logger
+%exclude %{_libdir}/heartbeat/hb_setsite
+%exclude %{_libdir}/heartbeat/ha_propagate
%dir %{_var}/run/heartbeat
%dir %{_var}/lib/heartbeat
%dir %{_var}/lib/heartbeat/cores
%dir %attr (0755, %{uname}, %{gname}) %{_var}/run/heartbeat/ccm
%{_sysconfdir}/ha.d
+%exclude %{_sysconfdir}/ha.d/resource.d
+%exclude %{_sysconfdir}/ha.d/shellfuncs
%{_sysconfdir}/init.d/heartbeat
%config(noreplace) %{_sysconfdir}/logrotate.d/heartbeat
-# This belongs in the ldirectord package
-%exclude %{_sysconfdir}/ha.d/resource.d/ldirectord
%{_libdir}/libclm.so.*
%{_libdir}/libhbclient.so.*
%{_libdir}/libccmclient.so.*
@@ -638,13 +641,13 @@
%doc %{_mandir}/man1/hb_standby.1*
%doc %{_mandir}/man1/hb_takeover.1*
%doc %{_mandir}/man8/heartbeat.8*
-%{_datadir}/doc/packages/heartbeat/*.txt
-%{_datadir}/doc/packages/heartbeat/*.html
-%{_datadir}/doc/packages/heartbeat/README
-%{_datadir}/doc/packages/heartbeat/authkeys
-%{_datadir}/doc/packages/heartbeat/startstop
-%{_datadir}/doc/packages/heartbeat/haresources
-%{_datadir}/doc/packages/heartbeat/ha.cf
+%doc %{_datadir}/doc/packages/heartbeat/*.txt
+%doc %{_datadir}/doc/packages/heartbeat/*.html
+%doc %{_datadir}/doc/packages/heartbeat/README
+%doc %{_datadir}/doc/packages/heartbeat/authkeys
+%doc %{_datadir}/doc/packages/heartbeat/startstop
+%doc %{_datadir}/doc/packages/heartbeat/haresources
+%doc %{_datadir}/doc/packages/heartbeat/ha.cf
###########################################################
%files -n libheartbeat2
@@ -662,6 +665,7 @@
%dir %{_libdir}/heartbeat/plugins
%dir %{_datadir}/heartbeat
%dir %{_datadir}/doc/packages/heartbeat
+%dir %{_sysconfdir}/ha.d
%{_sysconfdir}/ha.d/shellfuncs
%{_sbindir}/stonith
%{_sbindir}/meatclient
@@ -674,18 +678,22 @@
%{_libdir}/heartbeat/lrmadmin
%{_libdir}/heartbeat/lrmd
%{_libdir}/heartbeat/plugins/RAExec
-%{_libdir}/heartbeat/utillib.sh
+%exclude %{_libdir}/heartbeat/utillib.sh
+%exclude %{_libdir}/heartbeat/openais_conf_support.sh
+%exclude %{_libdir}/heartbeat/ha_cf_support.sh
%doc %{_mandir}/man8/apphbd.8*
%doc %{_mandir}/man8/stonith.8*
%doc %{_mandir}/man8/meatclient.8*
%doc %{_mandir}/man8/ha_logd.8*
%doc %{_datadir}/doc/packages/heartbeat/AUTHORS
-%doc %{_datadir}/doc/packages/heartbeat/README
+%exclude %doc %{_datadir}/doc/packages/heartbeat/README
%doc %{_datadir}/doc/packages/heartbeat/COPYING
%doc %{_datadir}/doc/packages/heartbeat/COPYING.LGPL
%exclude %{_datadir}/doc/packages/heartbeat/ChangeLog
%{_datadir}/doc/packages/heartbeat/logd.cf
%{_datadir}/heartbeat/utillib.sh
+%{_datadir}/heartbeat/ha_cf_support.sh
+%{_datadir}/heartbeat/openais_conf_support.sh
%{_datadir}/doc/packages/heartbeat/apphbd.cf
%{_var}/run/heartbeat
%dir %attr (0700, root, root) %{_var}/lib/heartbeat/cores/root
@@ -751,6 +759,8 @@
%defattr(-,root,root)
%dir /usr/lib/ocf
%dir /usr/lib/ocf/resource.d
+%{_sysconfdir}/ha.d/resource.d
+%exclude %{_sysconfdir}/ha.d/resource.d/ldirectord
/usr/lib/ocf/resource.d/heartbeat
%{_libdir}/heartbeat/send_arp
%{_libdir}/heartbeat/findif
@@ -781,6 +791,15 @@
%config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
%changelog
+* Fri Nov 21 2008 lmb@suse.de
+- hb_report: many fixes and improvements.
+- stonith: kdumpcheck: improve parsing for kdump_check_user.
+- RA: Squid: support the Squid proxy server as a service.
+- RA: drbd: Minor bugs and bash issues fixed.
+- CCM: Avoid passing NULL to glib functions using GHashTable.
+- Build fixes (LF#1977, LF#1976, LF#1980).
+- CTS: Move heartbeat-v1 resources to heartbeat-resources (bnc#446667).
+- Patch heartbeat-doc-directory.diff is now redundant.
* Tue Oct 28 2008 lmb@suse.de
- hb_report: Fix syntax error which prevented logs from being gathered
at all.
@@ -1629,9 +1648,9 @@
- Important overflow bug fixed for scenarios where heartbeat reaches
uptimes of >246days.
- Filelist cleanups.
-* Sat Apr 12 2003 lmb@suse.de
+* Fri Apr 11 2003 lmb@suse.de
- Fix and cleanup to previous fix.
-* Thu Apr 10 2003 lmb@suse.de
+* Wed Apr 09 2003 lmb@suse.de
- Fixes to heartbeat's mlockall() strategy to reduce the chance
of being hit by a page fault under load in timing critical
sections.
@@ -1757,9 +1776,9 @@
- next occurence of old gid
* Thu Jan 18 2001 ro@suse.de
- changed gid to 65 all over
-* Wed Jan 17 2001 ro@suse.de
+* Tue Jan 16 2001 ro@suse.de
- changed group-id to 65 (60 is already used)
-* Wed Jan 17 2001 mt@suse.de
+* Tue Jan 16 2001 mt@suse.de
- deleted '�' characters in spec file
* Tue Dec 19 2000 uli@suse.de
- added openssl to neededforbuild (needed by lynx)
++++++ heartbeat.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/bootstrap new/heartbeat/bootstrap
--- old/heartbeat/bootstrap 2008-10-28 17:35:08.000000000 +0100
+++ new/heartbeat/bootstrap 2008-11-19 19:34:26.000000000 +0100
@@ -256,7 +256,14 @@
rm -rf libltdl libltdl.tar
echo $libtoolize --ltdl --force --copy
-$libtoolize --ltdl --force --copy
+$libtoolize --ltdl --force --copy || {
+ if test -f /etc/debian_version; then
+ echo ""
+ echo "Running Debian? You probably need to install libltdl3-dev."
+ fi
+ exit 1
+}
+
echo $aclocal $ACLOCAL_FLAGS
$aclocal $ACLOCAL_FLAGS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/configure.in new/heartbeat/configure.in
--- old/heartbeat/configure.in 2008-10-28 17:35:08.000000000 +0100
+++ new/heartbeat/configure.in 2008-11-19 19:34:26.000000000 +0100
@@ -2212,20 +2212,20 @@
dnl check if header file and lib are there for zlib
zlib_installed="yes"
AC_CHECK_HEADERS(zlib.h, , [zlib_installed="no"],)
-AC_CHECK_LIB(z, compress , , [zlib_intalled="no"])
+AC_CHECK_LIB(z, compress , , [zlib_installed="no"])
AM_CONDITIONAL(BUILD_ZLIB_COMPRESS_MODULE, test "x${zlib_installed}" = "xyes")
dnl check if header file and lib are there for zlib
bz2_installed="yes"
AC_CHECK_HEADERS(bzlib.h, , [bz2_installed="no"],)
-AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress , , [bz2_intalled="no"])
+AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress , , [bz2_installed="no"])
AM_CONDITIONAL(BUILD_BZ2_COMPRESS_MODULE, test "x${bz2_installed}" = "xyes")
dnl check if header file and lib are there for openais module
openais_installed="yes"
AC_CHECK_HEADERS(evs.h, , [openais_installed="no"],)
-AC_CHECK_LIB(evs, evs_initialize , , [openais_intalled="no"])
+AC_CHECK_LIB(evs, evs_initialize , , [openais_installed="no"])
AM_CONDITIONAL(BUILD_OPENAIS_MODULE, test "x${openais_installed}" = "xyes")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/ConfigureMe new/heartbeat/ConfigureMe
--- old/heartbeat/ConfigureMe 2008-10-28 17:35:08.000000000 +0100
+++ new/heartbeat/ConfigureMe 2008-11-19 19:34:26.000000000 +0100
@@ -298,10 +298,19 @@
source ./heartbeat/lib/ha_config && \
Run $MAKE_CMD DESTDIR="$PWD/heartbeat-$VERSION/=inst" distcheck
;;
- pkg|package|rpm|deb|dpkg)
+ pkg|package|rpm)
do_configure $FLAGS $@ && \
PackageItUp
;;
+ deb|dpkg)
+ do_configure $FLAGS $@ &&
+ if which fakeroot > /dev/null; then
+ PackageItUp
+ else
+ echo ""
+ echo "Please install fakeroot if you want to build a deb."
+ fi
+ ;;
*)
Usage
;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/debian/heartbeat.install new/heartbeat/debian/heartbeat.install
--- old/heartbeat/debian/heartbeat.install 2008-10-28 17:35:08.000000000 +0100
+++ new/heartbeat/debian/heartbeat.install 2008-11-19 19:34:26.000000000 +0100
@@ -30,6 +30,7 @@
usr/lib/ocf/resource.d/heartbeat/SendArp
usr/lib/ocf/resource.d/heartbeat/ServeRAID
usr/lib/ocf/resource.d/heartbeat/SphinxSearchDaemon
+usr/lib/ocf/resource.d/heartbeat/Squid
usr/lib/ocf/resource.d/heartbeat/Stateful
usr/lib/ocf/resource.d/heartbeat/SysInfo
usr/lib/ocf/resource.d/heartbeat/VIPArip
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/doc/Makefile.am new/heartbeat/doc/Makefile.am
--- old/heartbeat/doc/Makefile.am 2008-10-28 17:35:08.000000000 +0100
+++ new/heartbeat/doc/Makefile.am 2008-11-19 19:34:26.000000000 +0100
@@ -19,7 +19,7 @@
#
MAINTAINERCLEANFILES = Makefile.in
-docdir = $(datadir)/doc/@HB_PKG@-@VERSION@
+docdir = $(datadir)/doc/packages/@HB_PKG@
htmlfiles = HardwareGuide.html \
GettingStarted.html \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/heartbeat/lib/ResourceManager.in new/heartbeat/heartbeat/lib/ResourceManager.in
--- old/heartbeat/heartbeat/lib/ResourceManager.in 2008-10-28 17:35:08.000000000 +0100
+++ new/heartbeat/heartbeat/lib/ResourceManager.in 2008-11-19 19:34:26.000000000 +0100
@@ -92,6 +92,7 @@
1) pat=$1 ;;
2) grepflags=$1; pat=$2 ;;
esac
+ if [ -f $HA_DIR/haresources ]; then
cat $HA_DIR/haresources |
#
# Explanation of Sed -e expressions below:
@@ -114,6 +115,7 @@
-e 's%^ %%' |
awk '/.*/ {$1 = tolower($1); print $0, ""}' |
egrep $grepflags "$pat"
+ fi
}
ipresline() {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/heartbeat.spec new/heartbeat/heartbeat.spec
--- old/heartbeat/heartbeat.spec 2008-10-28 17:35:08.000000000 +0100
+++ new/heartbeat/heartbeat.spec 2008-11-19 19:34:26.000000000 +0100
@@ -543,6 +543,8 @@
%{_datadir}/doc/packages/heartbeat/ChangeLog
%{_datadir}/doc/packages/heartbeat/logd.cf
%{_datadir}/heartbeat/utillib.sh
+%{_datadir}/heartbeat/ha_cf_support.sh
+%{_datadir}/heartbeat/openais_conf_support.sh
%{_datadir}/doc/packages/heartbeat/apphbd.cf
%{_var}/run/heartbeat
%dir %attr (0700, root, root) %{_var}/lib/heartbeat/cores/root
@@ -613,6 +615,8 @@
%{_libdir}/heartbeat/ocf-shellfuncs
%{_libdir}/heartbeat/send_arp
%{_libdir}/heartbeat/utillib.sh
+%{_libdir}/heartbeat/ha_cf_support.sh
+%{_libdir}/heartbeat/openais_conf_support.sh
%exclude %{_libdir}/heartbeat/ra-api-1.dtd
%{_datadir}/heartbeat/ra-api-1.dtd
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/.hg_archival.txt new/heartbeat/.hg_archival.txt
--- old/heartbeat/.hg_archival.txt 2008-10-28 17:35:08.000000000 +0100
+++ new/heartbeat/.hg_archival.txt 2008-11-19 19:34:26.000000000 +0100
@@ -1,2 +1,2 @@
repo: 8448b17e67437947c48c639c6faa4371c4a14b3b
-node: 2ba9f5a86dc67ef7da2299a54060407af68d32ae
+node: 9dbbc2cbd414036ea5e4e3a901fc3f48f5d5f1ad
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/lib/plugins/stonith/external/kdumpcheck.in new/heartbeat/lib/plugins/stonith/external/kdumpcheck.in
--- old/heartbeat/lib/plugins/stonith/external/kdumpcheck.in 2008-10-28 17:35:08.000000000 +0100
+++ new/heartbeat/lib/plugins/stonith/external/kdumpcheck.in 2008-11-19 19:34:26.000000000 +0100
@@ -69,14 +69,18 @@
##
get_username() {
kdump_conf="/etc/kdump.conf"
- config_name="kdump_check_user"
if [ ! -f "${kdump_conf}" ]; then
echo "`date`::DEBUG: ${kdump_conf} doesn't exist." | print_debug
return 0
fi
- tmp=`grep "^\s*${config_name}\>" ${kdump_conf} | awk '{print $2}'`
+ tmp=""
+ while read config_opt config_val; do
+ if [ "${config_opt}" = "kdump_check_user" ]; then
+ tmp="${config_val}"
+ fi
+ done < "${kdump_conf}"
if [ -n "${tmp}" ]; then
USERNAME="${tmp}"
fi
@@ -123,7 +127,7 @@
check_user_existence() {
# Get kdump check user name and check whether he exists or not.
- grep -q "^${USERNAME}\>" /etc/passwd > /dev/null 2>&1
+ grep -q "^${USERNAME}:" /etc/passwd > /dev/null 2>&1
ret=$?
if [ ${ret} != 0 ]; then
echo "`date`::ERROR: user ${USERNAME} doesn't exist." \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/membership/ccm/ccmlib_eventapi.c new/heartbeat/membership/ccm/ccmlib_eventapi.c
--- old/heartbeat/membership/ccm/ccmlib_eventapi.c 2008-10-28 17:35:08.000000000 +0100
+++ new/heartbeat/membership/ccm/ccmlib_eventapi.c 2008-11-19 19:34:26.000000000 +0100
@@ -252,9 +252,12 @@
int
oc_ev_unregister(oc_ev_t *tok)
{
- __oc_ev_t *token = (__oc_ev_t *)g_hash_table_lookup(tokenhash,
- tok);
-
+ __oc_ev_t *token = NULL;
+
+ if(tokenhash) {
+ token = g_hash_table_lookup(tokenhash, tok);
+ }
+
if(token == NULL || token_invalid(token)){
return EINVAL;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/resources/OCF/drbd new/heartbeat/resources/OCF/drbd
--- old/heartbeat/resources/OCF/drbd 2008-10-28 17:35:08.000000000 +0100
+++ new/heartbeat/resources/OCF/drbd 2008-11-19 19:34:26.000000000 +0100
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
#
# OCF Resource Agent compliant drbd resource script.
@@ -145,7 +145,8 @@
do_cmd() {
local cmd="$*"
ocf_log debug "$RESOURCE: Calling $cmd"
- local cmd_out=$($cmd 2>&1)
+ local cmd_out
+ cmd_out=$($cmd 2>&1)
ret=$?
if [ $ret -ne 0 ]; then
@@ -165,7 +166,8 @@
do_drbdadm() {
local cmd="$DRBDADM -c $DRBDCONF $*"
ocf_log debug "$RESOURCE: Calling $cmd"
- local cmd_out=$($cmd 2>&1)
+ local cmd_out
+ cmd_out=$($cmd 2>&1)
ret=$?
# Trim the garbage drbdadm likes to print when using the node
# override feature:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/resources/OCF/Makefile.am new/heartbeat/resources/OCF/Makefile.am
--- old/heartbeat/resources/OCF/Makefile.am 2008-10-28 17:35:08.000000000 +0100
+++ new/heartbeat/resources/OCF/Makefile.am 2008-11-19 19:34:26.000000000 +0100
@@ -81,6 +81,7 @@
SendArp \
ServeRAID \
SphinxSearchDaemon \
+ Squid \
Stateful \
SysInfo \
scsi2reservation \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/resources/OCF/.ocf-binaries.in new/heartbeat/resources/OCF/.ocf-binaries.in
--- old/heartbeat/resources/OCF/.ocf-binaries.in 2008-10-28 17:35:08.000000000 +0100
+++ new/heartbeat/resources/OCF/.ocf-binaries.in 2008-11-19 19:34:26.000000000 +0100
@@ -59,7 +59,7 @@
then
:
else
- if [ $OCF_NOT_RUNNING = 7 ]; then
+ if [ "$OCF_NOT_RUNNING" = 7 ]; then
# Chances are we have a fully setup OCF environment
ocf_log err "Setup problem: Couldn't find utility $1"
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/heartbeat/resources/OCF/Squid new/heartbeat/resources/OCF/Squid
--- old/heartbeat/resources/OCF/Squid 1970-01-01 01:00:00.000000000 +0100
+++ new/heartbeat/resources/OCF/Squid 2008-11-19 19:34:26.000000000 +0100
@@ -0,0 +1,446 @@
+#!/bin/bash
+#
+# Description: Manages a Squid Server provided by NTT OSSC as an
+# OCF High-Availability resource under Heartbeat/LinuxHA control
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# Copyright (c) 2008 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+#
+#######################################################################
+# OCF parameters:
+# OCF_RESKEY_squid_exe : Executable file
+# OCF_RESKEY_squid_conf : Configuration file
+# OCF_RESKEY_squid_pidfile: Process id file
+# OCF_RESKEY_squid_port : Port number
+# OCF_RESKEY_debug_mode : Debug mode
+# OCF_RESKEY_debug_log : Debug log file
+# OCF_RESKEY_squid_stop_timeout:
+# Number of seconds to await to confirm a
+# normal stop method
+#
+# OCF_RESKEY_squid_exe, OCF_RESKEY_squid_conf, OCF_RESKEY_squid_pidfile
+# and OCF_RESKEY_squid_port must be specified. Each of the rests
+# has its default value or refers OCF_RESKEY_squid_conf to make
+# its value when no explicit value is given.
+###############################################################################
+
+. ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
+
+usage()
+{
+ cat <<-!
+usage: $0 action
+
+action:
+ start : start a new squid instance
+
+ stop : stop the running squid instance
+
+ status : return the status of squid, run or down
+
+ monitor : return TRUE if the squid appears to be working.
+
+ meta-data : show meta data message
+
+ validate-all: validate the instance parameters
+!
+ return $OCF_ERR_ARGS
+}
+
+metadata_squid()
+{
+ cat <