The branch, master has been updated
via 92be23dbd6a5bf32d4d1af4a41437fbcd7d8eaf2 (commit)
via a953a0fb450955b62d747bdc82c5b968fe0ed378 (commit)
via 1ad0295f86370979d0537f7290f5e9c7d1ff6e94 (commit)
from c8181476748395fe6ec5284c49e9d37b882d15ea (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 92be23dbd6a5bf32d4d1af4a41437fbcd7d8eaf2
Author: Ronnie Sahlberg <[EMAIL PROTECTED]>
Date: Thu May 22 06:08:38 2008 +1000
move CTDB_MANAGES_NFS from /etc/sysconfig/nfs to /etc/sysconfig/ctdb
commit a953a0fb450955b62d747bdc82c5b968fe0ed378
Author: Ronnie Sahlberg <[EMAIL PROTECTED]>
Date: Thu May 22 06:04:36 2008 +1000
move the CTDB_MANAGES_ISCSI setting from /etc/sysconfig/iscsi to
/etc/sysconfig/ctdb
commit 1ad0295f86370979d0537f7290f5e9c7d1ff6e94
Author: Ronnie Sahlberg <[EMAIL PROTECTED]>
Date: Thu May 22 06:01:17 2008 +1000
move the config optoin CTDB_MANAGES_VSFTPD from /etc/sysconfig/vsftpd to
/etc/sysconfig/ctdb
-----------------------------------------------------------------------
Summary of changes:
config/ctdb.sysconfig | 10 ++++++++++
config/events.d/40.vsftpd | 1 +
config/events.d/60.nfs | 1 +
config/events.d/61.nfstickle | 1 +
config/events.d/70.iscsi | 1 +
web/ftp.html | 4 ++--
web/iscsi.html | 16 ++++++++++++----
web/nfs.html | 15 ++++++++++-----
8 files changed, 38 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index 58edbff..25b3f28 100644
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -46,6 +46,16 @@
# 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
+
+# should ctdb manage starting/stopping the ISCSI service
+# CTDB_MANAGES_ISCSI=yes
+
+# should ctdb manage starting/stopping the NFS service
+# CTDB_MANAGES_NFS=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 bc420fd..29f6fee 100755
--- 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/config/events.d/60.nfs b/config/events.d/60.nfs
index 5aaf693..c62eed3 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -2,6 +2,7 @@
# script to manage nfs in a clustered environment
. $CTDB_BASE/functions
+loadconfig ctdb
loadconfig nfs
[ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0
diff --git a/config/events.d/61.nfstickle b/config/events.d/61.nfstickle
index ab33cf1..5335595 100755
--- a/config/events.d/61.nfstickle
+++ b/config/events.d/61.nfstickle
@@ -4,6 +4,7 @@
PATH=/bin:/usr/bin:$PATH
. $CTDB_BASE/functions
+loadconfig ctdb
loadconfig nfs
cmd="$1"
diff --git a/config/events.d/70.iscsi b/config/events.d/70.iscsi
index cd43553..426e412 100755
--- a/config/events.d/70.iscsi
+++ b/config/events.d/70.iscsi
@@ -4,6 +4,7 @@
PATH=/bin:/usr/bin:$PATH
. $CTDB_BASE/functions
+loadconfig ctdb
loadconfig iscsi
cmd="$1"
diff --git a/web/ftp.html b/web/ftp.html
index 29947d4..82acd1d 100644
--- 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>
diff --git a/web/iscsi.html b/web/iscsi.html
index 7640937..1385e18 100644
--- a/web/iscsi.html
+++ b/web/iscsi.html
@@ -41,17 +41,25 @@ onnode all chkconfig tgtd off
Create this file and add the following three lines to it :
<pre>
- CTDB_MANAGES_ISCSI=yes
CTDB_START_ISCSI_SCRIPTS=/gpfs/iscsi/
</pre>
<p>
-CTDB_MANAGES_ISCSI=yes just tells CTDB event script for iSCSI that CTDB should
start and stop the iSCSI target service as required.
+CTDB_START_ISCSI_SCRIPTS=<directory on shared storage>
+This is a directory on shared storage where the scripts to start and configure
the iscsi service are held. There is one script for each public address named
<public address>.sh .
</p>
+
+<h2>/etc/sysconfig/ctdb</h2>
+
+Add the following line to /etc/sysconfig/ctdb :
+
+<pre>
+ CTDB_MANAGES_ISCSI=yes
+</pre>
+
<p>
-CTDB_START_ISCSI_SCRIPTS=<directory on shared storage>
-This is a directory on shared storage where the scripts to start and configure
the iscsi service are held. There is one script for each public address named
<public address>.sh .
+CTDB_MANAGES_ISCSI=yes just tells CTDB event script for iSCSI that CTDB should
start and stop the iSCSI target service as required.
</p>
diff --git a/web/nfs.html b/web/nfs.html
index ef10d0d..f5b626c 100644
--- a/web/nfs.html
+++ b/web/nfs.html
@@ -39,7 +39,6 @@ which causes problems on some clients.<br>
This file should look something like :
<pre>
- CTDB_MANAGES_NFS=yes
NFS_TICKLE_SHARED_DIRECTORY=/gpfs0/nfs-tickles
STATD_SHARED_DIRECTORY=/gpfs0/nfs-state
NFS_HOSTNAME=ctdb
@@ -54,10 +53,6 @@ This file should look something like :
</pre>
-The CTDB_MANAGES_NFS line tells the events scripts that CTDB is to manage
startup and shutdown of the NFS and NFSLOCK services.<br>
-
-With this set to yes, CTDB will start/stop/restart these services as
required.<br><br>
-
You need to make sure that the lock manager runs on the same port on all nodes
in the cluster since some clients will have "issues" and take very long to
recover if the port suddenly changes.<br>
599 above is only an example. You can run the lock manager on any available
port as long as you use the same port on all nodes.<br><br>
@@ -83,6 +78,16 @@ Always use the same name here as you use for the samba
hostname.
RPCNFSDARGS is used to disable support for NFSv4 which is not yet supported by
CTDB.
+<h2>/etc/sysconfig/ctdb</h2>
+Add the following line to /etc/sysconfig/ctdb :
+
+<pre>
+ CTDB_MANAGES_NFS=yes
+</pre>
+The CTDB_MANAGES_NFS line tells the events scripts that CTDB is to manage
startup and shutdown of the NFS and NFSLOCK services.<br>
+
+With this set to yes, CTDB will start/stop/restart these services as
required.<br><br>
+
<h2>chkconfig</h2>
--
CTDB repository
