merge from ronnie

(This used to be ctdb commit dcb43edad5f62d073d821cc67d1e4cd58811297c)

ctdb/tools/ctdb.sysconfig

@@ -48,11 +48,6 @@
 # the default is 0
 # DEBUGLEVEL=0
 
-# the shared directory where you want to put statd information on
-# which clients to notify on a NFS restart
-# there is no default
-# STATD_SHARED_DIRECTORY="/some/shared/directory"
-
 # any other options you might want. Run ctdbd --help for a list
 # CTDB_OPTIONS=
 

ctdb/tools/events.d/nfs

@@ -1,15 +1,23 @@
 #!/bin/sh
 # script to manage nfs in a clustered environment
 
-. /etc/sysconfig/ctdb
+. /etc/sysconfig/nfs
 . /etc/ctdb/functions
 
+[ -z $CTDB_MANAGES_NFS ] && exit 0
+[ $CTDB_MANAGES_NFS != "yes" ] && exit 0
+
 cmd="$1"
 shift
 
 case $cmd in 
      startup)
 	mkdir -p /etc/ctdb/state/nfs
+	service nfs start
+	;;
+
+     shutdown)
+	service nfs stop
 	;;
 
      releaseip)

ctdb/tools/events.d/nfslock

@@ -1,18 +1,23 @@
 #!/bin/sh
 # event strict to manage lockd and statd in a cluster environment
 
-. /etc/sysconfig/ctdb
+. /etc/sysconfig/nfs
 . /etc/ctdb/functions
 
+[ -z $CTDB_MANAGES_NFS ] && exit 0
+[ $CTDB_MANAGES_NFS != "yes" ] && exit 0
+
 cmd="$1"
 shift
 
 case $cmd in 
      startup)
 	/bin/mkdir -p /etc/ctdb/state/statd/ip
+	service nfslock start
 	;;
 
      shutdown)
+	service nfslock stop
 	;;
 
      takeip)

ctdb/tools/statd-callout

@@ -3,7 +3,7 @@
 # this script needs to be installed so that statd points to it with the -H 
 # command line argument. The easiest way to do that is 
 
-. /etc/sysconfig/ctdb
+. /etc/sysconfig/nfs
 
 [ -z "$STATD_SHARED_DIRECTORY" ] && exit 0
 

ctdb/web/ctdb.html

@@ -13,7 +13,7 @@ ctdb also provides HA features such as IP failover between nodes.
 It is the core component for samba3/4 clustering.
 
 To get started with ctdb, I would recommend you read <a
-href="http://wiki.samba.org/CTDB_Setup">the ctdb wiki</a>.
+href="http://wiki.samba.org/index.php/CTDB_Setup">the ctdb wiki</a>.
 
 <h2>Discussion and bug reports</h2>