move the config optoin CTDB_MANAGES_VSFTPD from /etc/sysconfig/vsftpd to /etc/sysconf...

diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index 58edbff9d9a7b1b4cb197724b07ccdf30c672c5f..06110382a0c7c64b3d6a23c3f050ebb5d3745060 100644 (file)
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -46,6 +46,10 @@
 # if left comented out then it will be autodetected based on smb.conf
 # CTDB_MANAGES_WINBIND=yes
 
+# should ctdb manage starting/stopping the VSFTPD service
+# CTDB_MANAGES_VSFTPD=yes
+
+
 # you may wish to raise the file descriptor limit for ctdb
 # use a ulimit command here. ctdb needs one file descriptor per
 # connected client (ie. one per connected client in Samba)

diff --git a/config/events.d/40.vsftpd b/config/events.d/40.vsftpd
index bc420fd42dcaf48455a49eeea1b630344274fb4a..29f6fee30f32b9ae6c5c3e795ac2b4f88be25921 100755 (executable)
--- a/config/events.d/40.vsftpd
+++ b/config/events.d/40.vsftpd
@@ -2,6 +2,7 @@
 # event strict to manage vsftpd in a cluster environment
 
 . $CTDB_BASE/functions
+loadconfig ctdb
 loadconfig vsftpd
 
 [ "$CTDB_MANAGES_VSFTPD" = "yes" ] || exit 0

diff --git a/web/ftp.html b/web/ftp.html
index 29947d4216703160f3ed52428225d42ed474519f..82acd1d9094516db1db70ad0f24e6ea529dbcbf1 100644 (file)
--- a/web/ftp.html
+++ b/web/ftp.html
@@ -13,9 +13,9 @@ Setting up a vsftpd cluster is really easy.<br>
 Configure vsftpd on each node on the cluster.<br><br>
 Set up vsftpd to export directories from the shared cluster filesystem.
 
-<h2>/etc/sysconfig/vsftpd</h2>
+<h2>/etc/sysconfig/ctdb</h2>
 
-Create the file /etc/sysconfig/vsftpd with the content :
+Add the following line to the /etc/sysconfig/ctdb configuration file.
 <pre>
   CTDB_MANAGES_VSFTPD=yes
 </pre>