From tateishi.katsuyuki ＠ oss.ntt.co.jp  Wed Oct 27 17:03:49 2010
From: tateishi.katsuyuki ＠ oss.ntt.co.jp (TATEISHI Katsuyuki)
Date: Wed, 27 Oct 2010 17:03:49 +0900 (JST)
Subject: [Ultramonkey-l7-develop 634] [PATCH 0/1] doc/heartbeat-ra: Purge
	SSLProxy, VIPcheck
Message-ID: <20101027.170349.639429391076532524.tateishi.katsuyuki@oss.ntt.co.jp>

立石です。こんにちは。

doc/heartbeat-ra の SSLProxy と VIPcheck の各 RA ですが、ソー
スツリーから削除したほうが良いと考えています。

SSLProxy は sslproxy パッケージに含めるべきものであり、先日の
不具合修正も UltraMonkey-L7 での新規リリースはせず、SSLProxy
RA を単独でリリースしています(将来的には sslproxy パッケージ
に含まれるはず)。UltraMonkey-L7 のツリーに残してもユーザの混
乱しそうなので、削除するべきだと思います。

VIPcheck はLinux-HA Japan プロジェクトさんに引き取っていただ
いたので、UltraMonkey-L7に残しておくと、こちらもユーザが混乱
しそうなので、削除するべきだと思っています。

v2.1.3-1 に対するパッチを作成したので、追って送信します。問題
がなければ時期リリースに含めてください。

--
TATEISHI Katsuyuki <tateishi.katsuyuki ＠ oss.ntt.co.jp>


From tateishi.katsuyuki ＠ oss.ntt.co.jp  Wed Oct 27 17:04:36 2010
From: tateishi.katsuyuki ＠ oss.ntt.co.jp (TATEISHI Katsuyuki)
Date: Wed, 27 Oct 2010 17:04:36 +0900
Subject: [Ultramonkey-l7-develop 635]
	=?utf-8?q?=5BPATCH_1/1=5D_doc/heartbeat-ra=3A_Purge_SSLProxy=2C_?=
	=?utf-8?q?VIPcheck?=
In-Reply-To: <20101027.170349.639429391076532524.tateishi.katsuyuki@oss.ntt.co.jp>
References: <20101027.170349.639429391076532524.tateishi.katsuyuki@oss.ntt.co.jp>
Message-ID: <1288166676-3890-1-git-send-email-tateishi.katsuyuki@oss.ntt.co.jp>

From: TATEISHI Katsuyuki <kt ＠ wheel.jp>

VIPcheck is now maintained at Linux-HA Japan(*1).
SSLProxy should be included in sslproxy package(*2).

 *1 Found at http://sourceforge.jp/projects/linux-ha/releases/?package_id=10292
    or http://sourceforge.jp/projects/linux-ha/releases/?package_id=10538
 *2 Latest version is
    http://sourceforge.jp/projects/ultramonkey-l7/downloads/49046/SSLProxy.gz/
    and it will be included in the next release of sslproxy packages.
---
 doc/heartbeat-ra/Makefile.am |    2 -
 doc/heartbeat-ra/README      |    2 -
 doc/heartbeat-ra/SSLProxy    |  236 ------------------------------------------
 doc/heartbeat-ra/VIPcheck    |  150 --------------------------
 4 files changed, 0 insertions(+), 390 deletions(-)
 delete mode 100644 doc/heartbeat-ra/SSLProxy
 delete mode 100644 doc/heartbeat-ra/VIPcheck

diff --git a/doc/heartbeat-ra/Makefile.am b/doc/heartbeat-ra/Makefile.am
index 059aa0d..f0bc6d9 100644
--- a/doc/heartbeat-ra/Makefile.am
+++ b/doc/heartbeat-ra/Makefile.am
@@ -2,8 +2,6 @@ dist_doc_DATA = \
 	L7directord \
 	L7vsd \
 	README \
-	SSLProxy \
-	VIPcheck \
 	authkeys \
 	cib.xml-sample \
 	cib.xml-sample.sslproxy \
diff --git a/doc/heartbeat-ra/README b/doc/heartbeat-ra/README
index 296bdcc..8d4ff1c 100644
--- a/doc/heartbeat-ra/README
+++ b/doc/heartbeat-ra/README
@@ -3,8 +3,6 @@ Heartbeat Resource Agent and example configuration files.
 == Files ==
 L7directord:	Resource Agent for l7directord.
 L7vsd:		Resource Agent for l7vsd.
-SSLProxy:	Resource Agent for sslproxy.
-VIPcheck:	Resource Agent for VIP.
 authkeys:	Heartbeat authkey example.
 cib.xml-sample:	Heartbeat cib.xml example.
 cib.xml-sample.ssl:
diff --git a/doc/heartbeat-ra/SSLProxy b/doc/heartbeat-ra/SSLProxy
deleted file mode 100644
index c215001..0000000
--- a/doc/heartbeat-ra/SSLProxy
+++ /dev/null
@@ -1,236 +0,0 @@
-#!/bin/sh
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Further, this software is distributed without any warranty that it is
-# free of the rightful claim of any third person regarding infringement
-# or the like.  Any license provided herein, whether implied or
-# otherwise, applies only to this software file.  Patent licenses, if
-# any, provided herein do not apply to combinations of this program with
-# other software, or any other product whatsoever.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-#
-
-#######################################################################
-# Initialization:
-
-#. ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
-. /usr/lib/ocf/resource.d/heartbeat/.ocf-shellfuncs
-
-#######################################################################
-
-meta_data() {
-	cat <<END
-<?xml version="1.0"?>
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="SSLProxy" version="1.0">
-<version>1.0</version>
-
-<longdesc lang="en">
-This is a SSLProxy Resource Agent.
-</longdesc>
-<shortdesc lang="en">SSLProxy resource agent</shortdesc>
-
-<parameters>
-<parameter name="state" unique="1">
-<longdesc lang="en">
-Location to store the resource state in.
-</longdesc>
-<shortdesc lang="en">State file</shortdesc>
-<content type="string" default="" />
-</parameter>
-
-</parameters>
-
-<actions>
-<action name="start"        timeout="60" />
-<action name="stop"         timeout="60" />
-<action name="monitor"      timeout="60" interval="10" depth="0" start-delay="0" />
-<action name="meta-data"    timeout="5" />
-</actions>
-</resource-agent>
-END
-}
-
-#######################################################################
-
-sslproxy_usage() {
-	cat <<END
-usage: $0 {start|stop|monitor|meta-data}
-END
-}
-
-###############################
-# Logging Method
-###############################
-outputLog(){
-	MODE=$1
-	shift
-	case $MODE in
-		err)	RET=$1; shift;
-			ocf_log $MODE "[$0 ${__OCF_ACTION}] NG;return=$RET" "$@";;
-	esac
-}
-
-###############################
-# kill process
-###############################
-sslproxy_pkill(){
-	pkill -9 sslproxy
-	ocf_log info "kill sslproxy process!"
-	while true
-	do
-		sleep 1
-		isRunning
-		RET=$?
-		if [ $RET -eq 0 ]; then
-			# stop OK
-			ocf_log info "sslproxy process stopped!"
-			return ${OCF_SUCCESS}
-		fi
-	done 
-}
-
-###############################
-# Resource Running Check Method
-###############################
-isRunning(){
-	RET=0
-	RET=`pgrep -fox '/usr/sbin/sslproxy .*' | wc -l`
-	return $RET
-}
-
-###############################
-# Get Resource Status Method
-###############################
-sslproxy_status(){
-	T_ID=`/usr/sbin/sslproxyadm status | grep "TargetID" | wc -l`
-	RET=`/usr/sbin/sslproxyadm status | grep "Starting. PID =" | wc -l`
-	if [ $RET -eq 0 ]; then
-		MSG="sslproxy status ERROR!."
-		outputLog err ${OCF_ERR_GENERIC} ${MSG}
-		return ${OCF_ERR_GENERIC}
-	elif [ $RET -lt $T_ID ]; then
-		MSG="sslproxy status ERROR!(Target is insufficient)."
-		outputLog err ${OCF_ERR_GENERIC} ${MSG}
-		return ${OCF_ERR_GENERIC}
-#	elif [ $RET -gt $T_ID ]; then
-#		MSG="sslproxy status ERROR!(Target_ID exceeds a set value)."
-#		outputLog err ${OCF_ERR_GENERIC} ${MSG}
-#		return ${OCF_ERR_GENERIC}
-	fi
-	return ${OCF_SUCCESS}
-}
-
-###############################
-# Get Resource Monitor Method
-###############################
-sslproxy_monitor() {
-	isRunning;
-	RET=$?
-	if [ $RET -eq 0 ]; then
-		MSG="sslproxy is not running."	
-		outputLog err ${OCF_NOT_RUNNING} ${MSG}
-		return ${OCF_NOT_RUNNING}
-	else
-		# sslproxy is running
-		sslproxy_status
-		if [ $? -eq ${OCF_SUCCESS} ]; then
-			# status OK
-			return ${OCF_SUCCESS}
-		else
-			break
-		fi		
-	fi
-	MSG="sslproxy does not work."
-	outputLog err ${OCF_ERR_GENERIC} ${MSG}
-	return ${OCF_ERR_GENERIC}
-}
-
-###############################
-# Resource start Method
-###############################
-sslproxy_start() {
-	ocf_log info "sslproxy is starting ..."
-	sslproxy_monitor
-	RET=$?
-	if [ $RET -eq ${OCF_SUCCESS} ]; then
-		ocf_log info "sslproxy is already running."
-		return $OCF_SUCCESS
-  	fi
-	/usr/sbin/sslproxyadm start > /dev/null 2>&1
-	RET=$?
-	if [ $RET -ne 0 ];then
-		MSG="sslproxy start error!."
-		outputLog err ${OCF_ERR_GENERIC} $MSG
-		return ${OCF_ERR_GENERIC}
-	fi
-	while true
-	do
-		isRunning;
-		RET=$?
-		if [ $RET -ne 0 ]; then
-			# sslproxy is running
-			ocf_log info "sslproxy starts."
-			return ${OCF_SUCCESS}
-		fi
-		sleep 1
-	done
-}
-
-###############################
-# Resource stop Method
-###############################
-sslproxy_stop() {
-	ocf_log info "sslproxy is stopping ..."
-	isRunning;
-	RET=$?
-	if [ $RET -eq 0 ]; then
-		ocf_log info "sslproxy stopped."
-		return ${OCF_SUCCESS}
-	fi
-	/usr/sbin/sslproxyadm stop > /dev/null 2>&1
-	count=0
-	while [ $count -le 10 ]
-	do
-		isRunning;
-		RET=$?
-		if [ $RET -eq 0 ]; then
-			ocf_log info "sslproxy stopped."
-			return ${OCF_SUCCESS}
-		fi
-		$count=`expr $count + 1`
-		sleep 1
-	done
-	
-	sslproxy_pkill
-	RET=$?	
-	
-        return $RET
-}
-
-case $__OCF_ACTION in
-meta-data)	meta_data
-		exit $OCF_SUCCESS ;;
-start)		sslproxy_start ;;
-stop)		sslproxy_stop ;;
-monitor)	sslproxy_monitor ;;
-usage|help)	sslproxy_usage
-		exit $OCF_SUCCESS
-		;;
-*)		sslproxy_usage
-		exit $OCF_ERR_UNIMPLEMENTED
-		;;
-esac
-rc=$?
-ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc"
-exit $rc
diff --git a/doc/heartbeat-ra/VIPcheck b/doc/heartbeat-ra/VIPcheck
deleted file mode 100644
index 21cba30..0000000
--- a/doc/heartbeat-ra/VIPcheck
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/sh
-#
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Further, this software is distributed without any warranty that it is
-# free of the rightful claim of any third person regarding infringement
-# or the like.  Any license provided herein, whether implied or
-# otherwise, applies only to this software file.  Patent licenses, if
-# any, provided herein do not apply to combinations of this program with
-# other software, or any other product whatsoever.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-#
-
-#######################################################################
-# Initialization:
-
-. ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
-#. /usr/lib/ocf/resource.d/heartbeat/.ocf-shellfuncs
-
-#######################################################################
-
-meta_data() {
-	cat <<END
-<?xml version="1.0"?>
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="VIPcheck" version="0.1">
-<version>1.0</version>
-
-<longdesc lang="en">
-This is a VIPcheck Resource Agent.
-</longdesc>
-<shortdesc lang="en">VIPcheck resource agent</shortdesc>
-
-<parameters>
-<parameter name="target_ip" unique="1">
-<longdesc lang="en">
-ping target VIP address.
-</longdesc>
-<shortdesc lang="en">target ip</shortdesc>
-<content type="string" default="" />
-</parameter>
-
-<parameter name="count" unique="1">
-<longdesc lang="en">
-repeat times
-</longdesc>
-<shortdesc lang="en">repeat times</shortdesc>
-<content type="integer" default="1" />
-</parameter>
-
-<parameter name="wait" unique="1">
-<longdesc lang="en">
-wait times
-</longdesc>
-<shortdesc lang="en">wait times</shortdesc>
-<content type="integer" default="10" />
-</parameter>
-
-</parameters>
-
-<actions>
-<action name="start"        timeout="60" />
-<action name="stop"         timeout="60" />
-<action name="monitor"      timeout="60" interval="10" depth="0" start-delay="0" />
-<action name="meta-data"    timeout="5" />
-</actions>
-</resource-agent>
-END
-}
-
-#######################################################################
-
-VIPcheck_usage() {
-	cat <<END
-usage: $0 {start|stop|monitor|meta-data}
-
-Expects to have a fully populated OCF RA-compliant environment set.
-END
-}
-
-VIPcheck_start() {
-	VIPcheck_monitor
-	if [ $? =  $OCF_SUCCESS ]; then
-		return $OCF_SUCCESS
-	fi 
-
-	ping ${OCF_RESKEY_target_ip} -c ${OCF_RESKEY_count} -w ${OCF_RESKEY_wait} > /dev/null 2>&1
-	prc=$?
-	ocf_log debug "target_ip = $OCF_RESKEY_target_ip, count = $OCF_RESKEY_count, wait = $OCF_RESKEY_wait"
-	ocf_log debug "ping return code = $prc"
-	if [ $prc = 0 ]; then 
-		# pingが通った-->ERROR
-		return $OCF_ERR_GENERIC
-	else 
-		# pingが通らない --> 成功
-		touch ${OCF_RESKEY_state}
-		return $OCF_SUCCESS
-	fi
-}
-
-VIPcheck_stop() {
-	VIPcheck_monitor
-	if [ $? =  $OCF_SUCCESS ]; then
-		rm ${OCF_RESKEY_state}
-	fi
-	return $OCF_SUCCESS
-}
-
-VIPcheck_monitor() {
-	if [ -f ${OCF_RESKEY_state} ]; then
-		return $OCF_SUCCESS
-	fi
-	if false ; then
-		return $OCF_ERR_GENERIC
-	fi
-	return $OCF_NOT_RUNNING
-}
-
-: ${OCF_RESKEY_wait=10}
-: ${OCF_RESKEY_count=1}
-: ${OCF_RESKEY_state=${HA_RSCTMP}/VIPcheck-${OCF_RESOURCE_INSTANCE}.state}
-
-case $__OCF_ACTION in
-meta-data)	meta_data
-		exit $OCF_SUCCESS
-		;;
-start)		VIPcheck_start;;
-stop)		VIPcheck_stop;;
-monitor)	VIPcheck_monitor;;
-usage|help)	VIPcheck_usage
-		exit $OCF_SUCCESS
-		;;
-*)		VIPcheck_usage
-		exit $OCF_ERR_UNIMPLEMENTED
-		;;
-esac
-rc=$?
-ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc"
-exit $rc
-
-- 
1.7.2.3


From tateishi.katsuyuki ＠ oss.ntt.co.jp  Wed Oct 27 17:17:33 2010
From: tateishi.katsuyuki ＠ oss.ntt.co.jp (TATEISHI Katsuyuki)
Date: Wed, 27 Oct 2010 17:17:33 +0900 (JST)
Subject: [Ultramonkey-l7-develop 636] Re: [PATCH 1/1] doc/heartbeat-ra:
 Purge SSLProxy, VIPcheck
In-Reply-To: <1288166676-3890-1-git-send-email-tateishi.katsuyuki@oss.ntt.co.jp>
References: <20101027.170349.639429391076532524.tateishi.katsuyuki@oss.ntt.co.jp>
	<1288166676-3890-1-git-send-email-tateishi.katsuyuki@oss.ntt.co.jp>
Message-ID: <20101027.171733.745972829209258570.tateishi.katsuyuki@oss.ntt.co.jp>

立石です。

下記のパッチですが、MLを経由すると charset/encoding が
iso-2022-jp になってしまうようで、コードに UTF-8 文字列が含ま
れているので、直接 git apply できません。

リポジトリにも push しておきましたので、パッチを当てる必要の
ある方はそちらで確認をおねがいします。

--
TATEISHI Katsuyuki <tateishi.katsuyuki ＠ oss.ntt.co.jp>


TATEISHI Katsuyuki <tateishi.katsuyuki ＠ oss.ntt.co.jp>-san wrote:

> From: TATEISHI Katsuyuki <kt ＠ wheel.jp>
> 
> VIPcheck is now maintained at Linux-HA Japan(*1).
> SSLProxy should be included in sslproxy package(*2).
> 
>  *1 Found at http://sourceforge.jp/projects/linux-ha/releases/?package_id=10292
>     or http://sourceforge.jp/projects/linux-ha/releases/?package_id=10538
>  *2 Latest version is
>     http://sourceforge.jp/projects/ultramonkey-l7/downloads/49046/SSLProxy.gz/
>     and it will be included in the next release of sslproxy packages.