diff options
| author | Martin Schwenke <martin@meltin.net> | 2015-07-19 21:23:44 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-07-21 07:54:09 +0200 |
| commit | b0bc4d2cab281ccb482e69dc56cb65d3059da75b (patch) | |
| tree | 9f3661e678a22a57dd07c5a44b42e474d5b9e099 /ctdb | |
| parent | dd88c2ab8c4d37c49b0c49f48b8e7e3ab7d5bdee (diff) | |
| download | samba-b0bc4d2cab281ccb482e69dc56cb65d3059da75b.tar.gz | |
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>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/doc/examples/20.nfs_ganesha.check (renamed from ctdb/config/nfs-checks.d/20.nfs_ganesha.disabled) | 0 | ||||
| -rw-r--r-- | ctdb/doc/examples/README | 13 | ||||
| -rwxr-xr-x | ctdb/doc/examples/nfs-ganesha-callout (renamed from ctdb/config/nfs-ganesha-callout) | 2 | ||||
| -rw-r--r-- | ctdb/packaging/RPM/ctdb.spec.in | 1 |
4 files changed, 13 insertions, 3 deletions
diff --git a/ctdb/config/nfs-checks.d/20.nfs_ganesha.disabled b/ctdb/doc/examples/20.nfs_ganesha.check index 3288f16f93c..3288f16f93c 100644 --- a/ctdb/config/nfs-checks.d/20.nfs_ganesha.disabled +++ b/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 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 |