summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com>2012-09-24 10:10:29 +0200
committerVijay Bellur <vbellur@redhat.com>2012-10-05 09:52:51 -0700
commitdbed2e2f150eb227c26258f8c065e7789e3f9bda (patch)
tree5a3465847a7900a79c59fd5bb7f56799010bdb35
parent748cf71a49d35b1a0366576521a2a7daa7fc3df3 (diff)
Fix docs to reflect change in GLUSTERD_DEFAULT_WORKDIR
Change-Id: I8ee98cece7a3c4ccdc4c444ff755fba37c75f169 BUG: 859849 Signed-off-by: Kacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com> Reviewed-on: http://review.gluster.org/3970 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--doc/admin-guide/en-US/admin_commandref.xml4
-rw-r--r--doc/admin-guide/en-US/admin_geo-replication.xml6
-rw-r--r--doc/admin-guide/en-US/glossary.xml2
-rw-r--r--doc/gluster.82
-rw-r--r--doc/glusterd.82
-rw-r--r--doc/glusterfs.82
-rw-r--r--doc/glusterfsd.82
7 files changed, 10 insertions, 10 deletions
diff --git a/doc/admin-guide/en-US/admin_commandref.xml b/doc/admin-guide/en-US/admin_commandref.xml
index df4c78f48..5e1560534 100644
--- a/doc/admin-guide/en-US/admin_commandref.xml
+++ b/doc/admin-guide/en-US/admin_commandref.xml
@@ -251,7 +251,7 @@ needing to schedule server downtime.
<para><emphasis role="bold">FILES</emphasis>
</para>
- <para>/etc/glusterd/*
+ <para>/var/lib/glusterd/*
</para>
<para><emphasis role="bold">SEE ALSO </emphasis></para>
<para>fusermount(1), mount.glusterfs(8), glusterfs-volgen(8), glusterfs(8), glusterd(8)</para>
@@ -326,7 +326,7 @@ needing to schedule server downtime.
<para><emphasis role="bold">FILES</emphasis>
</para>
- <para>/etc/glusterd/*
+ <para>/var/lib/glusterd/*
</para>
<para><emphasis role="bold">SEE ALSO </emphasis></para>
<para>fusermount(1), mount.glusterfs(8), glusterfs-volgen(8), glusterfs(8), gluster(8)</para>
diff --git a/doc/admin-guide/en-US/admin_geo-replication.xml b/doc/admin-guide/en-US/admin_geo-replication.xml
index b546bb8da..279e9a62c 100644
--- a/doc/admin-guide/en-US/admin_geo-replication.xml
+++ b/doc/admin-guide/en-US/admin_geo-replication.xml
@@ -221,14 +221,14 @@
<orderedlist>
<listitem>
<para>On the node where geo-replication sessions are to be set up, run the following command:</para>
- <para><command># ssh-keygen -f /etc/glusterd/geo-replication/secret.pem</command>
+ <para><command># ssh-keygen -f /var/lib/glusterd/geo-replication/secret.pem</command>
</para>
<para>Press Enter twice to avoid passphrase.
</para>
</listitem>
<listitem>
<para>Run the following command on master for all the slave hosts: </para>
- <para><command># ssh-copy-id -i /etc/glusterd/geo-replication/secret.pem.pub <varname>user</varname>@<varname>slavehost</varname></command></para>
+ <para><command># ssh-copy-id -i /var/lib/glusterd/geo-replication/secret.pem.pub <varname>user</varname>@<varname>slavehost</varname></command></para>
</listitem>
</orderedlist>
</section>
@@ -341,7 +341,7 @@ level access to the particular volume.</para>
<para>A sample glusterd volfile along with default options:</para>
<para><screen>volume management
type mgmt/glusterd
- option working-directory /etc/glusterd
+ option working-directory /var/lib/glusterd
option transport-type socket,rdma
option transport.socket.keepalive-time 10
option transport.socket.keepalive-interval 2
diff --git a/doc/admin-guide/en-US/glossary.xml b/doc/admin-guide/en-US/glossary.xml
index 8c314feaa..a8544b8cd 100644
--- a/doc/admin-guide/en-US/glossary.xml
+++ b/doc/admin-guide/en-US/glossary.xml
@@ -113,7 +113,7 @@
<glossentry>
<glossterm>Volfile</glossterm>
<glossdef>
- <para>Volfile is a configuration file used by glusterfs process. Volfile will be usually located at <filename>/etc/glusterd/vols/VOLNAME</filename>.</para>
+ <para>Volfile is a configuration file used by glusterfs process. Volfile will be usually located at <filename>/var/lib/glusterd/vols/VOLNAME</filename>.</para>
</glossdef>
</glossentry>
<glossentry>
diff --git a/doc/gluster.8 b/doc/gluster.8
index 532be973e..3c78fb8b1 100644
--- a/doc/gluster.8
+++ b/doc/gluster.8
@@ -114,7 +114,7 @@ Display the command options.
Exit the gluster command line interface.
.SH FILES
-/etc/glusterd/*
+/var/lib/glusterd/*
.SH SEE ALSO
.nf
\fBfusermount\fR(1), \fBmount.glusterfs\fR(8), \fBglusterfs\fR(8), \fBglusterd\fR(8)
diff --git a/doc/glusterd.8 b/doc/glusterd.8
index 144ba7455..04a43481e 100644
--- a/doc/glusterd.8
+++ b/doc/glusterd.8
@@ -50,7 +50,7 @@ Print the program version.
.PP
.SH FILES
-/etc/glusterd/*
+/var/lib/glusterd/*
.SH SEE ALSO
.nf
diff --git a/doc/glusterfs.8 b/doc/glusterfs.8
index e639d5a23..2afdf4c1a 100644
--- a/doc/glusterfs.8
+++ b/doc/glusterfs.8
@@ -101,7 +101,7 @@ Print the program version.
.PP
.SH FILES
-/etc/glusterfs/*.vol, /etc/glusterd/vols/*/*.vol
+/etc/glusterfs/*.vol, /var/lib/glusterd/vols/*/*.vol
.SH EXAMPLES
mount a volume named foo on server bar with log level DEBUG on mount point
/mnt/foo
diff --git a/doc/glusterfsd.8 b/doc/glusterfsd.8
index 3c25dfcfd..dd7cb0d2d 100644
--- a/doc/glusterfsd.8
+++ b/doc/glusterfsd.8
@@ -122,7 +122,7 @@ Print program version
.SH EXAMPLES
Start a GlusterFS server on localhost with volume name foo
-glusterfsd \-s localhost \-\-volfile\-id foo.server.media-disk\-1 \-p /etc/glusterd/vols/foo/run/server\-media\-disk\-1.pid \-S /tmp/<uniqueid>.socket \-\-brick-name /media/disk\-1 \-l /var/log/glusterfs/bricks/media\-disk\-1.log \-\-brick\-port 24009 \-\-xlator\-option foo\-server.listen-port=24009
+glusterfsd \-s localhost \-\-volfile\-id foo.server.media-disk\-1 \-p /var/lib/glusterd/vols/foo/run/server\-media\-disk\-1.pid \-S /tmp/<uniqueid>.socket \-\-brick-name /media/disk\-1 \-l /var/log/glusterfs/bricks/media\-disk\-1.log \-\-brick\-port 24009 \-\-xlator\-option foo\-server.listen-port=24009
.SH SEE ALSO
.nf