From: Martin Schwenke <martin@meltin.net>
Date: Wed, 31 Jan 2018 06:07:46 +0000 (+1100)
Subject: Revert "ctdb-doc: Fix monitoring bug in example NFS Ganesha call-out"
X-Git-Tag: talloc-2.1.12~203
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd66445eddd1273da034df703f6aba7864e8e542;p=thirdparty%2Fsamba.git

Revert "ctdb-doc: Fix monitoring bug in example NFS Ganesha call-out"

The check action should be there.  It is used by 20.nfs_ganesha.check.

This reverts commit 4fa9026bbd9f67348d3203e0205c59ff4fb51d2d.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/doc/examples/nfs-ganesha-callout b/ctdb/doc/examples/nfs-ganesha-callout
index d1f058b1934..f06b300c5b7 100755
--- a/ctdb/doc/examples/nfs-ganesha-callout
+++ b/ctdb/doc/examples/nfs-ganesha-callout
@@ -321,7 +321,7 @@ shutdown
 startup
 stop
 start
-monitor-pre
+check
 releaseip
 takeip
 monitor-list-shares
@@ -338,12 +338,12 @@ shutdown)            nfs_shutdown            ;;
 startup)             nfs_startup             ;;
 stop)                service_stop "$1"       ;;
 start)               service_start "$1"      ;;
-monitor-pre)         service_check "$1"      ;;
+check)               service_check "$1"      ;;
 releaseip)           nfs_releaseip "$@"      ;;
 takeip)              nfs_takeip "$@"         ;;
 monitor-list-shares) nfs_monitor_list_shares ;;
 register)            nfs_register            ;;
-monitor-post|releaseip-pre|takeip-pre)
+monitor-pre|monitor-post|releaseip-pre|takeip-pre)
 	# Not required/implemented
 	:
 	;;