From: Martin Schwenke <martin@meltin.net>
Date: Sun, 19 Jul 2015 11:23:44 +0000 (+1000)
Subject: ctdb-scripts: Move 60.nfs Ganesha callout to doc/examples/
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=b0bc4d2cab281ccb482e69dc56cb65d3059da75b;p=kai%2Fsamba.git

ctdb-scripts: Move 60.nfs Ganesha callout to doc/examples/

We don't expect to maintain an up-to-date copy.  NFS Ganesha team
might provide patches.

Also move the Ganesha .check file

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

diff --git a/ctdb/config/nfs-checks.d/20.nfs_ganesha.disabled b/ctdb/doc/examples/20.nfs_ganesha.check
similarity index 100%
rename from ctdb/config/nfs-checks.d/20.nfs_ganesha.disabled
rename to ctdb/doc/examples/20.nfs_ganesha.check
diff --git a/ctdb/doc/examples/README b/ctdb/doc/examples/README
index 7a2e964bffa..b3ca1c197a7 100644
--- a/ctdb/doc/examples/README
+++ b/ctdb/doc/examples/README
@@ -1,5 +1,16 @@
-This directory includes sample CTDB cluster configurations.
+This directory includes...
+
+Sample CTDB cluster configurations
 
   o cluster.conf  - Basic cluster setup
   o natgw.conf    - Basic cluster setup with NAT gateway feature
   o external.conf - Basic cluster setup with externally managed public IP addresses
+
+
+Sample 60.nfs configuration for NFS ganesha - callout script and
+.check file
+
+  o nfs-ganesha-callout
+  o 20.nfs_ganesha.check
+
+See the comment at the top of nfs-ganesha-callout for instructions.
diff --git a/ctdb/config/nfs-ganesha-callout b/ctdb/doc/examples/nfs-ganesha-callout
similarity index 98%
rename from ctdb/config/nfs-ganesha-callout
rename to ctdb/doc/examples/nfs-ganesha-callout
index b66611c84f9..3f0a016c387 100755
--- a/ctdb/config/nfs-ganesha-callout
+++ b/ctdb/doc/examples/nfs-ganesha-callout
@@ -17,7 +17,7 @@
 # * Rename nfs-checks.d/{20.nfs.check,30.nlockmgr.check,50.mountd.check}
 #   so that they no longer have the ".check" suffix
 #
-# * Rename nfs-checks.d/20.nfs-ganesha.disabled to nfs-checks.d/20.nfs.check
+# * Install 20.nfs-ganesha.check to nfs-checks.d/20.nfs.check
 
 # I (Martin Schwenke) hereby relicense all of my contributions to this
 # callout (and, previously, to 60.ganesha) to a license compatible
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index c356b6c21d6..00f0be56a19 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -187,7 +187,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/00.portmapper.check
 %config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/10.status.check
 %config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/20.nfs.check
-%config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/20.nfs_ganesha.disabled
 %config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/30.nlockmgr.check
 %config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/40.mountd.check
 %config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/50.rquotad.check